summaryrefslogtreecommitdiff
path: root/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp')
-rw-r--r--TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp26
1 files changed, 20 insertions, 6 deletions
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
index 9e3d30e1f5d..6d0b095aad1 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SyntaxTree/Component.hpp
@@ -23,11 +23,14 @@ namespace CCF
//
class ComponentDecl : public virtual TypeDecl
{
- protected:
+ public:
virtual
~ComponentDecl () throw () {}
- ComponentDecl ()
+ ComponentDecl (SimpleName const& name,
+ ScopePtr const& scope)
+ : Declaration (name, scope),
+ TypeDecl (name, scope)
{
type_info (static_type_info ());
}
@@ -66,7 +69,10 @@ namespace CCF
ComponentForwardDecl (SimpleName const& name,
ScopePtr const& scope)
- : Declaration (name, scope)
+ : Declaration (name, scope),
+ TypeDecl (name, scope),
+ ComponentDecl (name, scope),
+ TypeForwardDecl (name, scope)
{
type_info (static_type_info ());
}
@@ -113,7 +119,11 @@ namespace CCF
ScopedName const& inherits,
ScopedNameSet const& supports)
: Declaration (name, scope),
- inherits_ (table (), inherits)
+ TypeDecl (name, scope),
+ TypeDef (name, scope),
+ ComponentDecl (name, scope),
+ Scope (name, scope),
+ inherits_ (scope->table (), inherits)
{
type_info (static_type_info ());
copy_supports_list (supports);
@@ -123,7 +133,11 @@ namespace CCF
ScopePtr const& scope,
ScopedNameSet const& supports)
: Declaration (name, scope),
- inherits_ (table ())
+ TypeDecl (name, scope),
+ TypeDef (name, scope),
+ ComponentDecl (name, scope),
+ Scope (name, scope),
+ inherits_ (scope->table ())
{
type_info (static_type_info ());
copy_supports_list (supports);
@@ -137,7 +151,7 @@ namespace CCF
i != supports.end ();
i++)
{
- supports_.insert (InterfaceDefRef (table (), *i));
+ supports_.insert (InterfaceDefRef (scope ()->table (), *i));
}
}