diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-18 22:54:36 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-18 22:54:36 +0000 |
| commit | c3d6207e8a1469ace8ac7cb5683e24d13edde3ad (patch) | |
| tree | 31803ab904ce444fae0d4c09c3ad4643bf2545b1 | |
| parent | d962de7484784d44a19ca5732689bdc4ae2f2007 (diff) | |
| download | ATCD-c3d6207e8a1469ace8ac7cb5683e24d13edde3ad.tar.gz | |
ChangeLogTag: Thu Feb 18 22:53:29 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
152 files changed, 377 insertions, 1406 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bbc9ff7b245..467db73d666 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,166 @@ +Thu Feb 18 22:53:29 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/include/ast_root.h: + * TAO_IDL/include/ast_valuebox.h: + * TAO_IDL/include/ast_module.h: + * TAO_IDL/include/ast_union_label.h: + * TAO_IDL/include/ast_union.h: + * TAO_IDL/include/ast_interface_fwd.h: + * TAO_IDL/include/ast_structure.h: + * TAO_IDL/include/ast_component_fwd.h: + * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: + * TAO_IDL/include/ast_string.h: + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/ast_factory.h: + * TAO_IDL/include/ast_valuetype.h: + * TAO_IDL/include/ast_argument.h: + * TAO_IDL/include/ast_eventtype.h: + * TAO_IDL/include/ast_native.h: + * TAO_IDL/include/ast_union_fwd.h: + * TAO_IDL/include/ast_home.h: + * TAO_IDL/include/ast_structure_fwd.h: + * TAO_IDL/include/ast_enum_val.h: + * TAO_IDL/include/ast_sequence.h: + * TAO_IDL/include/ast_valuetype_fwd.h: + * TAO_IDL/include/ast_eventtype_fwd.h: + * TAO_IDL/include/ast_exception.h: + * TAO_IDL/include/ast_attribute.h: + * TAO_IDL/include/ast_enum.h: + * TAO_IDL/include/ast_union_branch.h: + * TAO_IDL/include/ast_type.h: + * TAO_IDL/include/ast_field.h: + * TAO_IDL/include/ast_constant.h: + * TAO_IDL/include/ast_interface.h: + * TAO_IDL/include/ast_operation.h: + * TAO_IDL/include/ast_component.h: + * TAO_IDL/include/ast_concrete_type.h: + * TAO_IDL/include/ast_predefined_type.h: + * TAO_IDL/include/ast_array.h: + * TAO_IDL/be/be_union.cpp: + * TAO_IDL/be/be_interface_fwd.cpp: + * TAO_IDL/be/be_attribute.cpp: + * TAO_IDL/be/be_factory.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_union_fwd.cpp: + * TAO_IDL/be/be_union_branch.cpp: + * TAO_IDL/be/be_valuetype_fwd.cpp: + * TAO_IDL/be/be_type.cpp: + * TAO_IDL/be/be_home.cpp: + * TAO_IDL/be/be_enum_val.cpp: + * TAO_IDL/be/be_mirror_port.cpp: + * TAO_IDL/be/be_valuebox.cpp: + * TAO_IDL/be/be_component.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_util.cpp: + * TAO_IDL/be/be_eventtype_fwd.cpp: + * TAO_IDL/be/be_expression.cpp: + * TAO_IDL/be/be_typedef.cpp: + * TAO_IDL/be/be_structure.cpp: + * TAO_IDL/be/be_component_fwd.cpp: + * TAO_IDL/be/be_operation_strategy.cpp: + * TAO_IDL/be/be_interface_strategy.cpp: + * TAO_IDL/be/be_field.cpp: + * TAO_IDL/be/be_module.cpp: + * TAO_IDL/be/be_structure_fwd.cpp: + * TAO_IDL/be/be_predefined_type.cpp: + * TAO_IDL/be/be_argument.cpp: + * TAO_IDL/be/be_constant.cpp: + * TAO_IDL/be/be_exception.cpp: + * TAO_IDL/be/be_extended_port.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_eventtype.cpp: + * TAO_IDL/be/be_root.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_operation.cpp: + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_string.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be/be_template_module.cpp: + * TAO_IDL/be/be_native.cpp: + * TAO_IDL/be/be_porttype.cpp: + * TAO_IDL/be/be_union_label.cpp: + * TAO_IDL/ast/ast_home.cpp: + * TAO_IDL/ast/ast_union_fwd.cpp: + * TAO_IDL/ast/ast_constant.cpp: + * TAO_IDL/ast/ast_structure_fwd.cpp: + * TAO_IDL/ast/ast_operation.cpp: + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/ast/ast_component.cpp: + * TAO_IDL/ast/ast_concrete_type.cpp: + * TAO_IDL/ast/ast_predefined_type.cpp: + * TAO_IDL/ast/ast_enum_val.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/ast/ast_valuetype_fwd.cpp: + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_eventtype_fwd.cpp: + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/ast/ast_valuebox.cpp: + * TAO_IDL/ast/ast_module.cpp: + * TAO_IDL/ast/ast_union_label.cpp: + * TAO_IDL/ast/ast_union.cpp: + * TAO_IDL/ast/ast_exception.cpp: + * TAO_IDL/ast/ast_interface_fwd.cpp: + * TAO_IDL/ast/ast_structure.cpp: + * TAO_IDL/ast/ast_component_fwd.cpp: + * TAO_IDL/ast/ast_attribute.cpp: + * TAO_IDL/ast/ast_enum.cpp: + * TAO_IDL/ast/ast_union_branch.cpp: + * TAO_IDL/ast/ast_string.cpp: + * TAO_IDL/ast/ast_decl.cpp: + * TAO_IDL/ast/ast_factory.cpp: + * TAO_IDL/ast/ast_valuetype.cpp: + * TAO_IDL/ast/ast_type.cpp: + * TAO_IDL/ast/ast_argument.cpp: + * TAO_IDL/ast/ast_field.cpp: + * TAO_IDL/ast/ast_eventtype.cpp: + * TAO_IDL/ast/ast_native.cpp: + * TAO_IDL/be_include/be_field.h: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_operation.h: + * TAO_IDL/be_include/be_component.h: + * TAO_IDL/be_include/be_enum.h: + * TAO_IDL/be_include/be_union_branch.h: + * TAO_IDL/be_include/be_type.h: + * TAO_IDL/be_include/be_union.h: + * TAO_IDL/be_include/be_interface_fwd.h: + * TAO_IDL/be_include/be_component_fwd.h: + * TAO_IDL/be_include/be_root.h: + * TAO_IDL/be_include/be_eventtype.h: + * TAO_IDL/be_include/be_valuebox.h: + * TAO_IDL/be_include/be_union_fwd.h: + * TAO_IDL/be_include/be_predefined_type.h: + * TAO_IDL/be_include/be_argument.h: + * TAO_IDL/be_include/be_union_label.h: + * TAO_IDL/be_include/be_home.h: + * TAO_IDL/be_include/be_exception.h: + * TAO_IDL/be_include/be_attribute.h: + * TAO_IDL/be_include/be_factory.h: + * TAO_IDL/be_include/be_module.h: + * TAO_IDL/be_include/be_string.h: + * TAO_IDL/be_include/be_array.h: + * TAO_IDL/be_include/be_native.h: + * TAO_IDL/be_include/be_constant.h: + * TAO_IDL/be_include/be_structure.h: + * TAO_IDL/be_include/be_typedef.h: + * TAO_IDL/be_include/be_valuetype.h: + * TAO_IDL/be_include/be_structure_fwd.h: + * TAO_IDL/be_include/be_decl.h: + * TAO_IDL/be_include/be_valuetype_fwd.h: + * TAO_IDL/be_include/be_eventtype_fwd.h: + * TAO_IDL/be_include/be_enum_val.h: + * TAO_IDL/be_include/be_sequence.h: + + Removed unused constructors. + + * TAO_IDL/util/utl_scope.cpp: + * TAO_IDL/include/utl_scope.h: + + - Moved static methods inside class UTL_Scope + and removed related static variables. + + - Re-implemented is_global_name() to + eliminate memory leaks and heap allocations. + Thu Feb 18 20:36:04 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp: diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp index ee1015b36a5..419ff28718e 100644 --- a/TAO/TAO_IDL/ast/ast_argument.cpp +++ b/TAO/TAO_IDL/ast/ast_argument.cpp @@ -95,14 +95,6 @@ direction_to_string (AST_Argument::Direction d) AST_Decl::NodeType const AST_Argument::NT = AST_Decl::NT_argument; -AST_Argument::AST_Argument (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - pd_direction (dir_IN) -{ -} - AST_Argument::AST_Argument (Direction d, AST_Type *ft, UTL_ScopedName *n) diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index ccb87b660b1..eb624b430f2 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -80,23 +80,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/Log_Msg.h" #include "ace/OS_Memory.h" -// Constructor(s) and destructor. - AST_Decl::NodeType const AST_Array::NT = AST_Decl::NT_array; -AST_Array::AST_Array (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - pd_n_dims (0), - pd_dims (0), - pd_base_type (0), - owns_base_type_ (false) -{ -} - AST_Array::AST_Array (UTL_ScopedName *n, ACE_CDR::ULong nd, UTL_ExprList *ds, diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp index 18eec60c143..199b137834d 100644 --- a/TAO/TAO_IDL/ast/ast_attribute.cpp +++ b/TAO/TAO_IDL/ast/ast_attribute.cpp @@ -82,17 +82,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Attribute::NT = AST_Decl::NT_attr; -// Constructor(s) and destructor. -AST_Attribute::AST_Attribute (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - pd_readonly (true), - pd_get_exceptions (0), - pd_set_exceptions (0) -{ -} - AST_Attribute::AST_Attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp index 058e020d279..f6227a232cb 100644 --- a/TAO/TAO_IDL/ast/ast_component.cpp +++ b/TAO/TAO_IDL/ast/ast_component.cpp @@ -17,16 +17,6 @@ AST_Decl::NodeType const AST_Component::NT = AST_Decl::NT_component; -AST_Component::AST_Component (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - pd_base_component (0) -{ -} - AST_Component::AST_Component (UTL_ScopedName *n, AST_Component *base_component, AST_Type **supports, diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp index 932c4348191..766152554f7 100644 --- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp @@ -7,14 +7,6 @@ AST_Decl::NodeType const AST_ComponentFwd::NT = AST_Decl::NT_component_fwd; -AST_ComponentFwd::AST_ComponentFwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd () -{ -} - AST_ComponentFwd::AST_ComponentFwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (true, diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp index 1bb26e6fe96..5719f4ca019 100644 --- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp +++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp @@ -69,14 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_concrete_type.h" -// Constructor(s) and destructor. -AST_ConcreteType::AST_ConcreteType (void) - : COMMON_Base (), - AST_Decl (), - AST_Type () -{ -} - AST_ConcreteType::AST_ConcreteType (AST_Decl::NodeType nt, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index b513dcefaf9..f8daab685bc 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -125,18 +125,6 @@ AST_Constant::exprtype_to_string (AST_Expression::ExprType et) AST_Decl::NodeType const AST_Constant::NT = AST_Decl::NT_const; -// Constructor(s) and destructor. - -// Default constructor. -AST_Constant::AST_Constant (void) - : COMMON_Base (), - AST_Decl (), - pd_constant_value (0), - pd_et (AST_Expression::EV_none), - ifr_added_ (0) -{ -} - // Used in constructing AST_EnumVal nodes. AST_Constant::AST_Constant (AST_Expression::ExprType t, AST_Decl::NodeType nt, diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 9207840d6a1..b253094962b 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -130,30 +130,6 @@ COMMON_Base::destroy (void) { } -// Constructor(s) and destructor. - -AST_Decl::AST_Decl (void) - : COMMON_Base (), - repoID_ (0), - flat_name_ (0), - contains_wstring_ (-1), - pd_imported (false), - pd_in_main_file (false), - pd_defined_in (0), - pd_node_type (NT_module), - pd_line (-1), - pd_local_name (0), - pd_original_local_name (0), - full_name_ (0), - prefix_ (0), - version_ (0), - anonymous_ (false), - typeid_set_ (false), - last_referenced_as_ (0), - prefix_scope_ (0) -{ -} - AST_Decl::AST_Decl (NodeType nt, UTL_ScopedName *n, bool anonymous) diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp index e32d768c503..44d900e7304 100644 --- a/TAO/TAO_IDL/ast/ast_enum.cpp +++ b/TAO/TAO_IDL/ast/ast_enum.cpp @@ -75,18 +75,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Enum::NT = AST_Decl::NT_enum; -AST_Enum::AST_Enum (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - pd_enum_counter (0), - member_count_ (-1) -{ - this->size_type (AST_Type::FIXED); -} - AST_Enum::AST_Enum (UTL_ScopedName *n, bool local, bool abstract) @@ -278,7 +266,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, false)) != 0) + if ((d = this->lookup_for_add (t)) != 0) { if (!can_be_redefined (d)) { diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp index 3f3aba24512..c7abab6b8e7 100644 --- a/TAO/TAO_IDL/ast/ast_enum_val.cpp +++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp @@ -74,13 +74,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_EnumVal::NT = AST_Decl::NT_enum_val; -AST_EnumVal::AST_EnumVal (void) - : COMMON_Base (), - AST_Decl (), - AST_Constant () -{ -} - AST_EnumVal::AST_EnumVal (ACE_CDR::ULong v, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp index 1b46cebd000..85ece04f369 100644 --- a/TAO/TAO_IDL/ast/ast_eventtype.cpp +++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp @@ -10,16 +10,6 @@ AST_Decl::NodeType const AST_EventType::NT = AST_Decl::NT_eventtype; -AST_EventType::AST_EventType (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - AST_ValueType () -{ -} - AST_EventType::AST_EventType (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp index 97928ede177..d44e3aeba3f 100644 --- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp @@ -8,15 +8,6 @@ AST_Decl::NodeType const AST_EventTypeFwd::NT = AST_Decl::NT_eventtype_fwd; -AST_EventTypeFwd::AST_EventTypeFwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd (), - AST_ValueTypeFwd () -{ -} - AST_EventTypeFwd::AST_EventTypeFwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (false, diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp index ca6114ac195..685b66273e7 100644 --- a/TAO/TAO_IDL/ast/ast_exception.cpp +++ b/TAO/TAO_IDL/ast/ast_exception.cpp @@ -83,16 +83,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Exception::NT = AST_Decl::NT_except; -AST_Exception::AST_Exception (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure () -{ -} - AST_Exception::AST_Exception (UTL_ScopedName *n, bool local, bool abstract) diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp index 4fc921a7c4e..347ec3470c9 100644 --- a/TAO/TAO_IDL/ast/ast_factory.cpp +++ b/TAO/TAO_IDL/ast/ast_factory.cpp @@ -82,17 +82,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Factory::NT = AST_Decl::NT_factory; -AST_Factory::AST_Factory (void) - : COMMON_Base (), - AST_Decl (), - UTL_Scope (), - pd_exceptions (0), - pd_n_exceptions (0), - argument_count_ (-1), - has_native_ (0) -{ -} - AST_Factory::AST_Factory (UTL_ScopedName *n) : COMMON_Base (true, false), //@@ Always local, never abstract diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index 2e399693659..fc20472e2d5 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -86,16 +86,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Field::NT = AST_Decl::NT_field; -AST_Field::AST_Field (void) - : COMMON_Base (), - AST_Decl (), - ref_type_ (0), - visibility_ (vis_NA), - owns_base_type_ (false) -{ -} - -// To be used when constructing an AST_Field node. AST_Field::AST_Field (AST_Type *ft, UTL_ScopedName *n, Visibility vis) diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp index bdb945c8d18..fd3319534a0 100644 --- a/TAO/TAO_IDL/ast/ast_home.cpp +++ b/TAO/TAO_IDL/ast/ast_home.cpp @@ -16,18 +16,6 @@ AST_Decl::NodeType const AST_Home::NT = AST_Decl::NT_home; -AST_Home::AST_Home (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - pd_base_home (0), - pd_managed_component (0), - pd_primary_key (0) -{ -} - AST_Home::AST_Home (UTL_ScopedName *n, AST_Home *base_home, AST_Component *managed_component, diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 224204419e8..279fda53b46 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -103,22 +103,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Interface::NT = AST_Decl::NT_interface; -AST_Interface::AST_Interface (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - pd_inherits (0), - pd_n_inherits (0), - pd_inherits_flat (0), - pd_n_inherits_flat (0), - home_equiv_ (false), - fwd_decl_ (0) -{ - this->size_type (AST_Type::VARIABLE); // Always the case. - this->has_constructor (true); // Always the case. -} - AST_Interface::AST_Interface (UTL_ScopedName *n, AST_Type **ih, long nih, @@ -899,8 +883,7 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e, } AST_Decl * -AST_Interface::lookup_for_add (AST_Decl *d, - bool /* treat_as_ref */) +AST_Interface::lookup_for_add (AST_Decl *d) { if (d == 0) { diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp index b5b57c5eb0a..558f1bf4c90 100644 --- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp @@ -78,15 +78,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_InterfaceFwd::NT = AST_Decl::NT_interface_fwd; -AST_InterfaceFwd::AST_InterfaceFwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - pd_full_definition (0), - is_defined_ (false) -{ -} - AST_InterfaceFwd::AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (dummy->is_local (), diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 9f375555313..43cbdd0fc45 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -104,13 +104,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Module::NT = AST_Decl::NT_module; -AST_Module::AST_Module (void) - : AST_Decl (), - UTL_Scope (), - pd_has_nested_valuetype (0) -{ -} - AST_Module::AST_Module (UTL_ScopedName *n) : AST_Decl (AST_Decl::NT_module, n), @@ -157,7 +150,7 @@ AST_Module::fe_add_module (AST_Module *t) } // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, false)) != 0) + if ((d = this->lookup_for_add (t)) != 0) { if (!can_be_redefined (d)) { diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp index 67f332129d3..a2d555b72d2 100644 --- a/TAO/TAO_IDL/ast/ast_native.cpp +++ b/TAO/TAO_IDL/ast/ast_native.cpp @@ -6,17 +6,6 @@ AST_Decl::NodeType const AST_Native::NT = AST_Decl::NT_native; -AST_Native::AST_Native (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure (), - AST_Exception () -{ -} - AST_Native::AST_Native (UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_native, diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp index 64026d575f1..818aa3f2241 100644 --- a/TAO/TAO_IDL/ast/ast_operation.cpp +++ b/TAO/TAO_IDL/ast/ast_operation.cpp @@ -94,19 +94,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Operation::NT = AST_Decl::NT_op; -AST_Operation::AST_Operation (void) - : COMMON_Base (), - AST_Decl(), - UTL_Scope(), - pd_return_type (0), - pd_flags (OP_noflags), - pd_context (0), - pd_exceptions (0), - argument_count_ (-1), - has_native_ (0) -{ -} - AST_Operation::AST_Operation (AST_Type *rt, Flags fl, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp index 22481f8d310..0fda4201ff7 100644 --- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp +++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp @@ -81,15 +81,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_PredefinedType::NT = AST_Decl::NT_pre_defined; -AST_PredefinedType::AST_PredefinedType (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - pd_pt (PT_long) -{ -} - AST_PredefinedType::AST_PredefinedType (PredefinedType t, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp index 596ba708e87..fc5694bd000 100644 --- a/TAO/TAO_IDL/ast/ast_root.cpp +++ b/TAO/TAO_IDL/ast/ast_root.cpp @@ -81,14 +81,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Root::NT = AST_Decl::NT_root; -AST_Root::AST_Root (void) - : COMMON_Base (), - AST_Decl (), - UTL_Scope (), - AST_Module () -{ -} - AST_Root::AST_Root (UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_root, diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp index 4695760f9f2..1827823d37a 100644 --- a/TAO/TAO_IDL/ast/ast_sequence.cpp +++ b/TAO/TAO_IDL/ast/ast_sequence.cpp @@ -89,19 +89,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_Sequence::NT = AST_Decl::NT_sequence; -AST_Sequence::AST_Sequence (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - pd_max_size (0), - pd_base_type (0), - owns_base_type_ (false) -{ - // A sequence data type is always VARIABLE. - this->size_type (AST_Type::VARIABLE); -} - AST_Sequence::AST_Sequence (AST_Expression *ms, AST_Type *bt, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp index a11be1b2889..80e261ada79 100644 --- a/TAO/TAO_IDL/ast/ast_string.cpp +++ b/TAO/TAO_IDL/ast/ast_string.cpp @@ -82,18 +82,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_String::NT = AST_Decl::NT_string; -AST_String::AST_String (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - pd_max_size (0), - pd_width (sizeof (char)) -{ - // Always the case. - this->size_type (AST_Type::VARIABLE); -} - AST_String::AST_String (AST_Decl::NodeType nt, UTL_ScopedName *n, AST_Expression *ms, diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp index 6fce029d771..f46245c7ac8 100644 --- a/TAO/TAO_IDL/ast/ast_structure.cpp +++ b/TAO/TAO_IDL/ast/ast_structure.cpp @@ -80,18 +80,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "utl_indenter.h" -AST_Structure::AST_Structure (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - member_count_ (-1), - local_struct_ (-1), - fwd_decl_ (0) -{ -} - AST_Structure::AST_Structure (UTL_ScopedName *n, bool local, bool abstract) diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp index 755fd106428..3a28f0ffe2e 100644 --- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp @@ -13,15 +13,6 @@ AST_Decl::NodeType const AST_StructureFwd::NT = AST_Decl::NT_struct_fwd; -AST_StructureFwd::AST_StructureFwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - pd_full_definition (0), - is_defined_ (false) -{ -} - AST_StructureFwd::AST_StructureFwd (AST_Structure *full_defn, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index 137507cd9ca..d576b9e413d 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -78,19 +78,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/OS_NS_stdio.h" #include "ace/OS_Memory.h" -AST_Type::AST_Type (void) - : COMMON_Base (), - AST_Decl (), - ifr_added_ (0), - ifr_fwd_added_ (0), - size_type_ (AST_Type::SIZE_UNKNOWN), - has_constructor_ (0), - nested_type_name_ (0), - in_recursion_ (-1), - recursing_in_legal_pk_ (false) -{ -} - AST_Type::AST_Type (AST_Decl::NodeType nt, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index 1c65135423c..45dd72b8eb6 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -90,17 +90,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -AST_Union::AST_Union (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure (), - default_index_ (-2) -{ -} - AST_Union::AST_Union (AST_ConcreteType *dt, UTL_ScopedName *n, bool local, diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp index 5861796d589..75bd44ffec1 100644 --- a/TAO/TAO_IDL/ast/ast_union_branch.cpp +++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp @@ -80,14 +80,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. AST_Decl::NodeType const AST_UnionBranch::NT = AST_Decl::NT_union_branch; -AST_UnionBranch::AST_UnionBranch (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - pd_ll (0) -{ -} - AST_UnionBranch::AST_UnionBranch (UTL_LabelList *ll, AST_Type *ft, UTL_ScopedName *n) diff --git a/TAO/TAO_IDL/ast/ast_union_fwd.cpp b/TAO/TAO_IDL/ast/ast_union_fwd.cpp index ce51214dbe0..7cd63dcf00c 100644 --- a/TAO/TAO_IDL/ast/ast_union_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_union_fwd.cpp @@ -13,14 +13,6 @@ AST_Decl::NodeType const AST_UnionFwd::NT = AST_Decl::NT_union_fwd; -AST_UnionFwd::AST_UnionFwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_StructureFwd () -{ -} - AST_UnionFwd::AST_UnionFwd (AST_Union *dummy, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp index 47dbead41fc..96ea4d01fc8 100644 --- a/TAO/TAO_IDL/ast/ast_union_label.cpp +++ b/TAO/TAO_IDL/ast/ast_union_label.cpp @@ -76,12 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -AST_UnionLabel::AST_UnionLabel (void) - : pd_label_kind (UL_default), - pd_label_val (0) -{ -} - AST_UnionLabel::AST_UnionLabel (UnionLabel lk, AST_Expression *lv) : pd_label_kind (lk), diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp index 8911c5b7739..832f6cf478c 100644 --- a/TAO/TAO_IDL/ast/ast_valuebox.cpp +++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp @@ -7,14 +7,6 @@ AST_Decl::NodeType const AST_ValueBox::NT = AST_Decl::NT_valuebox; -AST_ValueBox::AST_ValueBox (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType () -{ -} - AST_ValueBox::AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type) : COMMON_Base (), diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp index da4cde38869..7eb4add3277 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp @@ -22,21 +22,6 @@ AST_Decl::NodeType const AST_ValueType::NT = AST_Decl::NT_valuetype; -AST_ValueType::AST_ValueType (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - pd_supports (0), - pd_n_supports (0), - pd_inherits_concrete (0), - pd_supports_concrete (0), - pd_truncatable (false), - pd_custom (false) -{ -} - AST_ValueType::AST_ValueType (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp index eff8cf7da2b..cfc3b778dcc 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp @@ -8,14 +8,6 @@ AST_Decl::NodeType const AST_ValueTypeFwd::NT = AST_Decl::NT_valuetype_fwd; -AST_ValueTypeFwd::AST_ValueTypeFwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd () -{ -} - AST_ValueTypeFwd::AST_ValueTypeFwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (false, diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp index 3f434b6bad6..c18855c84f3 100644 --- a/TAO/TAO_IDL/be/be_argument.cpp +++ b/TAO/TAO_IDL/be/be_argument.cpp @@ -14,22 +14,12 @@ */ //============================================================================= - #include "be_argument.h" #include "be_type.h" #include "be_visitor.h" #include "nr_extern.h" #include "global_extern.h" -be_argument::be_argument (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - AST_Argument (), - be_decl () -{ -} - be_argument::be_argument (AST_Argument::Direction d, AST_Type *ft, UTL_ScopedName *n) diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index d0245ab4e1a..12b46af4791 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_array.h" #include "be_codegen.h" #include "be_scope.h" @@ -26,17 +25,6 @@ #include "ace/Log_Msg.h" -be_array::be_array (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - AST_Array (), - be_decl (), - be_type () -{ -} - be_array::be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp index ab919e5c3b9..3d7e228be9e 100644 --- a/TAO/TAO_IDL/be/be_attribute.cpp +++ b/TAO/TAO_IDL/be/be_attribute.cpp @@ -14,32 +14,12 @@ */ //============================================================================= - #include "be_attribute.h" #include "be_type.h" #include "be_visitor.h" #include "global_extern.h" -be_attribute::be_attribute (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - AST_Attribute (), - be_decl (), - original_attribute_ (0) -{ - be_operation_default_strategy *bods = 0; - - ACE_NEW (bods, - be_operation_default_strategy (0)); - this->get_strategy_ = bods; - - ACE_NEW (bods, - be_operation_default_strategy (0)); - this->set_strategy_ = bods; -} - be_attribute::be_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index 64d5bf2eccd..a3bfe952110 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -13,29 +13,12 @@ */ //============================================================================= - #include "be_component.h" #include "be_visitor.h" #include "global_extern.h" #include "utl_err.h" -be_component::be_component (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - AST_Component (), - be_scope (), - be_decl (), - be_type (), - be_interface () -{ - this->size_type (AST_Type::VARIABLE); - this->has_constructor (true); -} - be_component::be_component (UTL_ScopedName *n, AST_Component *base_component, AST_Type **supports, diff --git a/TAO/TAO_IDL/be/be_component_fwd.cpp b/TAO/TAO_IDL/be/be_component_fwd.cpp index 48977719540..3c5b12ffd8c 100644 --- a/TAO/TAO_IDL/be/be_component_fwd.cpp +++ b/TAO/TAO_IDL/be/be_component_fwd.cpp @@ -13,24 +13,11 @@ */ //============================================================================= - #include "be_component_fwd.h" #include "be_visitor.h" #include "global_extern.h" #include "utl_err.h" -be_component_fwd::be_component_fwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd (), - AST_ComponentFwd (), - be_type (), - be_interface_fwd () -{ - this->size_type (AST_Type::VARIABLE); -} - be_component_fwd::be_component_fwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (), @@ -42,6 +29,8 @@ be_component_fwd::be_component_fwd (AST_Interface *dummy, n), AST_ComponentFwd (dummy, n), + be_decl (AST_Decl::NT_component_fwd, + n), be_type (AST_Decl::NT_component_fwd, n), be_interface_fwd (dummy, diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp index d519a2a513a..2ca74288d66 100644 --- a/TAO/TAO_IDL/be/be_constant.cpp +++ b/TAO/TAO_IDL/be/be_constant.cpp @@ -14,20 +14,11 @@ */ //============================================================================= - #include "be_constant.h" #include "be_visitor.h" #include "utl_scope.h" #include "nr_extern.h" -be_constant::be_constant (void) - : COMMON_Base (), - AST_Decl (), - AST_Constant (), - be_decl () -{ -} - be_constant::be_constant (AST_Expression::ExprType et, AST_Expression *v, UTL_ScopedName *n) diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp index 266a5c9fbb7..d80570b3561 100644 --- a/TAO/TAO_IDL/be/be_decl.cpp +++ b/TAO/TAO_IDL/be/be_decl.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_decl.h" #include "be_scope.h" #include "be_interface.h" @@ -45,62 +44,6 @@ #include "ace/Log_Msg.h" #include "ace/String_Base.h" -// Default Constructor -be_decl::be_decl (void) - : COMMON_Base (), - AST_Decl (), - cli_hdr_gen_ (false), - cli_stub_gen_ (false), - cli_inline_gen_ (false), - srv_hdr_gen_ (false), - impl_hdr_gen_ (false), - srv_skel_gen_ (false), - impl_skel_gen_ (false), - srv_inline_gen_ (false), - tie_skel_gen_ (false), - cli_hdr_any_op_gen_ (false), - cli_stub_any_op_gen_ (false), - cli_hdr_cdr_op_gen_ (false), - cli_stub_cdr_op_gen_ (false), - cli_inline_cdr_op_gen_ (false), - cli_inline_cdr_decl_gen_ (false), - cli_hdr_serializer_op_gen_ (false), - cli_stub_serializer_op_gen_ (false), - cli_inline_serializer_op_gen_ (false), - cli_inline_serializer_decl_gen_ (false), - cli_traits_gen_ (false), - cli_arg_traits_gen_ (false), - srv_arg_traits_gen_ (false), - srv_sarg_traits_gen_ (false), - cli_pragma_inst_gen_ (false), - cli_inarg_tmpl_class_gen_ (false), - cli_inarg_pragma_inst_gen_ (false), - cli_inoutarg_tmpl_class_gen_ (false), - cli_inoutarg_pragma_inst_gen_ (false), - cli_outarg_tmpl_class_gen_ (false), - cli_outarg_pragma_inst_gen_ (false), - cli_retarg_tmpl_class_gen_ (false), - cli_retarg_pragma_inst_gen_ (false), - srv_tmpl_class_gen_ (false), - srv_pragma_inst_gen_ (false), - srv_inarg_tmpl_class_gen_ (false), - srv_inarg_pragma_inst_gen_ (false), - srv_inoutarg_tmpl_class_gen_ (false), - srv_inoutarg_pragma_inst_gen_ (false), - srv_outarg_tmpl_class_gen_ (false), - srv_outarg_pragma_inst_gen_ (false), - srv_retarg_tmpl_class_gen_ (false), - srv_retarg_pragma_inst_gen_ (false), - ccm_pre_proc_gen_ (false), - ex_idl_facet_gen_ (false), - svnt_hdr_facet_gen_ (false), - svnt_src_facet_gen_ (false), - exec_hdr_facet_gen_ (false), - exec_src_facet_gen_ (false) -{ -} - -// Constructor be_decl::be_decl (AST_Decl::NodeType type, UTL_ScopedName *n) : COMMON_Base (), @@ -157,7 +100,6 @@ be_decl::be_decl (AST_Decl::NodeType type, { } -// Destructor be_decl::~be_decl (void) { } diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 4f4fb944ce1..1bc36f1f7a1 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -14,26 +14,12 @@ */ //============================================================================= - #include "be_enum.h" #include "be_visitor.h" #include "be_helper.h" #include "global_extern.h" -be_enum::be_enum (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Enum (), - be_scope (), - be_decl (), - be_type () -{ -} - be_enum::be_enum (UTL_ScopedName *n, bool local, bool abstract) diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp index 3ef99d9d647..2459c943168 100644 --- a/TAO/TAO_IDL/be/be_enum_val.cpp +++ b/TAO/TAO_IDL/be/be_enum_val.cpp @@ -14,19 +14,9 @@ */ //============================================================================= - #include "be_enum_val.h" #include "be_visitor.h" -be_enum_val::be_enum_val (void) - : COMMON_Base (), - AST_Decl (), - AST_Constant (), - AST_EnumVal (), - be_decl () -{ -} - be_enum_val::be_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp index 9fc2cce857b..4ddc50d516c 100644 --- a/TAO/TAO_IDL/be/be_eventtype.cpp +++ b/TAO/TAO_IDL/be/be_eventtype.cpp @@ -13,30 +13,11 @@ */ //============================================================================= - #include "be_eventtype.h" #include "be_visitor.h" #include "global_extern.h" -// Default constructor. -be_eventtype::be_eventtype (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - be_scope (), - be_decl (), - be_type (), - be_interface (), - AST_ValueType (), - be_valuetype (), - AST_EventType () -{ -} - -// Constructor used to build the AST. be_eventtype::be_eventtype (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, diff --git a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp index faec4400ef0..ca8b79c2177 100644 --- a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp +++ b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp @@ -13,8 +13,6 @@ */ //============================================================================= - - #include "be_eventtype_fwd.h" #include "be_visitor.h" @@ -22,20 +20,6 @@ #include "global_extern.h" -be_eventtype_fwd::be_eventtype_fwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd (), - be_decl (), - be_type (), - be_interface_fwd (), - AST_ValueTypeFwd (), - be_valuetype_fwd (), - AST_EventTypeFwd () -{ -} - be_eventtype_fwd::be_eventtype_fwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (dummy->is_local (), diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp index 5ebef82b302..ca576b7c2e9 100644 --- a/TAO/TAO_IDL/be/be_exception.cpp +++ b/TAO/TAO_IDL/be/be_exception.cpp @@ -14,30 +14,11 @@ */ //============================================================================= - - #include "be_exception.h" #include "be_visitor.h" #include "global_extern.h" -be_exception::be_exception (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure (), - AST_Exception (), - be_scope (), - be_decl (), - be_type (), - be_structure () -{ - // Always the case. - this->size_type (AST_Type::VARIABLE); -} - be_exception::be_exception (UTL_ScopedName *n, bool local, bool abstract) @@ -62,7 +43,8 @@ be_exception::be_exception (UTL_ScopedName *n, n), be_type (AST_Decl::NT_except, n), - be_structure (n, + be_structure (AST_Decl::NT_except, + n, local, abstract) { diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp index d7e66b7f048..2802dc46423 100644 --- a/TAO/TAO_IDL/be/be_expression.cpp +++ b/TAO/TAO_IDL/be/be_expression.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_expression.h" #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be/be_extended_port.cpp b/TAO/TAO_IDL/be/be_extended_port.cpp index d476e370713..079688d40aa 100644 --- a/TAO/TAO_IDL/be/be_extended_port.cpp +++ b/TAO/TAO_IDL/be/be_extended_port.cpp @@ -17,6 +17,8 @@ be_extended_port::be_extended_port ( n), AST_Extended_Port (n, porttype_ref), + be_decl (AST_Decl::NT_ext_port, + n), be_field (porttype_ref, n) { diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp index 34afbfe54f6..5d3d1679097 100644 --- a/TAO/TAO_IDL/be/be_factory.cpp +++ b/TAO/TAO_IDL/be/be_factory.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_factory.h" #include "be_visitor.h" @@ -26,16 +25,6 @@ #include "global_extern.h" -be_factory::be_factory (void) - : COMMON_Base (), - AST_Decl (), - UTL_Scope (), - AST_Factory (), - be_scope (), - be_decl () -{ -} - be_factory::be_factory (UTL_ScopedName *n) : COMMON_Base (1, 0), //@@ Always local, never abstract diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp index 056aec243d9..199e6cfbb47 100644 --- a/TAO/TAO_IDL/be/be_field.cpp +++ b/TAO/TAO_IDL/be/be_field.cpp @@ -14,21 +14,12 @@ */ //============================================================================= - #include "be_field.h" #include "be_visitor.h" #include "be_type.h" #include "global_extern.h" #include "ace/Log_Msg.h" -be_field::be_field (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - be_decl () -{ -} - be_field::be_field (AST_Type *ft, UTL_ScopedName *n, Visibility vis) diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp index 7bb5cb9ad86..9ead4b728d4 100644 --- a/TAO/TAO_IDL/be/be_home.cpp +++ b/TAO/TAO_IDL/be/be_home.cpp @@ -13,7 +13,6 @@ */ //============================================================================= - #include "be_home.h" #include "be_component.h" #include "be_interface_strategy.h" @@ -21,20 +20,6 @@ #include "global_extern.h" #include "utl_err.h" -be_home::be_home (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - AST_Home (), - be_scope (), - be_type (), - be_interface () -{ - this->size_type (AST_Type::VARIABLE); -} - be_home::be_home (UTL_ScopedName *n, AST_Home *base_home, AST_Component *managed_component, @@ -66,6 +51,8 @@ be_home::be_home (UTL_ScopedName *n, supports_flat, n_supports_flat), be_scope (AST_Decl::NT_home), + be_decl (AST_Decl::NT_home, + n), be_type (AST_Decl::NT_home, n), be_interface (n, diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 34c4e6e051c..7df1bcf5dc9 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -15,7 +15,6 @@ */ //============================================================================= - #include "be_interface.h" #include "be_interface_strategy.h" #include "be_component.h" @@ -42,28 +41,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" -// Default constructor. -be_interface::be_interface (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - be_scope (), - be_type (), - var_out_seq_decls_gen_ (0), - skel_count_ (0), - in_mult_inheritance_ (-1), - strategy_ (0), - original_interface_ (0), - has_mixed_parentage_ (-1), - session_component_child_ (-1) -{ - ACE_NEW (this->strategy_, - be_interface_default_strategy (this)); -} - -// Constructor used to build the AST. be_interface::be_interface (UTL_ScopedName *n, AST_Type **ih, long nih, @@ -86,6 +63,8 @@ be_interface::be_interface (UTL_ScopedName *n, local, abstract), be_scope (AST_Decl::NT_interface), + be_decl (AST_Decl::NT_interface, + n), be_type (AST_Decl::NT_interface, n), var_out_seq_decls_gen_ (0), diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp index 093561853a3..9d9a2ea4f9c 100644 --- a/TAO/TAO_IDL/be/be_interface_fwd.cpp +++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp @@ -14,24 +14,11 @@ */ //============================================================================= - #include "be_interface_fwd.h" #include "be_interface.h" #include "be_visitor.h" #include "ast_interface.h" -be_interface_fwd::be_interface_fwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd (), - be_decl (), - be_type () -{ - // Always the case. - this->size_type (AST_Type::VARIABLE); -} - be_interface_fwd::be_interface_fwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (dummy->is_local (), diff --git a/TAO/TAO_IDL/be/be_interface_strategy.cpp b/TAO/TAO_IDL/be/be_interface_strategy.cpp index edba8ffd82b..82a1d1d639e 100644 --- a/TAO/TAO_IDL/be/be_interface_strategy.cpp +++ b/TAO/TAO_IDL/be/be_interface_strategy.cpp @@ -13,7 +13,6 @@ */ //============================================================================= - #include "be_interface_strategy.h" #include "be_interface.h" #include "be_extern.h" diff --git a/TAO/TAO_IDL/be/be_mirror_port.cpp b/TAO/TAO_IDL/be/be_mirror_port.cpp index 952bf7e06dc..7b330b35869 100644 --- a/TAO/TAO_IDL/be/be_mirror_port.cpp +++ b/TAO/TAO_IDL/be/be_mirror_port.cpp @@ -19,6 +19,8 @@ be_mirror_port::be_mirror_port ( porttype_ref), AST_Mirror_Port (n, porttype_ref), + be_decl (AST_Decl::NT_interface, + n), be_field (porttype_ref, n), be_extended_port (n, diff --git a/TAO/TAO_IDL/be/be_module.cpp b/TAO/TAO_IDL/be/be_module.cpp index 6e3e8926b6b..12830451390 100644 --- a/TAO/TAO_IDL/be/be_module.cpp +++ b/TAO/TAO_IDL/be/be_module.cpp @@ -14,19 +14,9 @@ */ //============================================================================= - #include "be_module.h" #include "be_visitor.h" -be_module::be_module (void) - : COMMON_Base (), - AST_Decl (), - UTL_Scope (), - be_scope (), - be_decl () -{ -} - be_module::be_module (UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_module, diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp index ac32e274d15..07a69c8df18 100644 --- a/TAO/TAO_IDL/be/be_native.cpp +++ b/TAO/TAO_IDL/be/be_native.cpp @@ -12,25 +12,9 @@ */ //============================================================================= - #include "be_native.h" #include "be_visitor.h" -be_native::be_native (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure (), - AST_Native (), - be_scope (), - be_decl (), - be_type (), - be_exception () -{ -} - be_native::be_native (UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_native, @@ -52,6 +36,9 @@ be_native::be_native (UTL_ScopedName *n) n), be_type (AST_Decl::NT_native, n), + be_structure (n, + true, + false), be_exception (n, true, false) diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp index ee536c5a273..7caa058666a 100644 --- a/TAO/TAO_IDL/be/be_operation.cpp +++ b/TAO/TAO_IDL/be/be_operation.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_operation.h" #include "be_operation_strategy.h" #include "be_predefined_type.h" @@ -28,19 +27,6 @@ #include "global_extern.h" -be_operation::be_operation (void) - : COMMON_Base (), - AST_Decl (), - UTL_Scope (), - AST_Operation (), - be_scope (), - be_decl (), - original_operation_ (0) -{ - ACE_NEW (this->strategy_, - be_operation_default_strategy (this)); -} - be_operation::be_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/be/be_operation_strategy.cpp b/TAO/TAO_IDL/be/be_operation_strategy.cpp index 97d163a7a5b..2136d86e0e0 100644 --- a/TAO/TAO_IDL/be/be_operation_strategy.cpp +++ b/TAO/TAO_IDL/be/be_operation_strategy.cpp @@ -13,7 +13,6 @@ */ //============================================================================= - #include "be_operation_strategy.h" #include "be_operation.h" diff --git a/TAO/TAO_IDL/be/be_porttype.cpp b/TAO/TAO_IDL/be/be_porttype.cpp index 03f7585d0da..c0eef67e4fa 100644 --- a/TAO/TAO_IDL/be/be_porttype.cpp +++ b/TAO/TAO_IDL/be/be_porttype.cpp @@ -8,6 +8,8 @@ be_porttype::be_porttype (UTL_ScopedName *n) false), AST_Decl (AST_Decl::NT_porttype, n), + AST_Type (AST_Decl::NT_porttype, + n), UTL_Scope (AST_Decl::NT_porttype), AST_PortType (n), be_scope (AST_Decl::NT_porttype), diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp index 4000afdbf91..4370f2e4ccf 100644 --- a/TAO/TAO_IDL/be/be_predefined_type.cpp +++ b/TAO/TAO_IDL/be/be_predefined_type.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_predefined_type.h" #include "be_visitor.h" #include "be_helper.h" @@ -25,19 +24,9 @@ #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" -be_predefined_type::be_predefined_type (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - AST_PredefinedType (), - be_decl (), - be_type () -{ -} - -be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t, - UTL_ScopedName *n) +be_predefined_type::be_predefined_type ( + AST_PredefinedType::PredefinedType t, + UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_pre_defined, n, diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp index 20afa7e2cf0..4044a2f912d 100644 --- a/TAO/TAO_IDL/be/be_root.cpp +++ b/TAO/TAO_IDL/be/be_root.cpp @@ -14,25 +14,12 @@ */ //============================================================================= - #include "be_root.h" #include "be_visitor.h" #include "ast_sequence.h" #include "ast_string.h" #include "ast_array.h" -// Default Constructor. -be_root::be_root (void) - : COMMON_Base (), - AST_Decl (), - UTL_Scope (), - AST_Root (), - be_scope (), - be_decl () -{ -} - -// Constructor used to build the root of the abstract syntax tree (AST). be_root::be_root (UTL_ScopedName *n) : COMMON_Base (), AST_Decl (AST_Decl::NT_root, diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index bf9dd6e5732..8cfe07450a1 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_sequence.h" #include "be_typedef.h" #include "be_interface.h" @@ -32,23 +31,6 @@ #include "ace/Log_Msg.h" -be_sequence::be_sequence (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - AST_Sequence (), - UTL_Scope (), - be_scope (), - be_decl (), - be_type (), - mt_ (be_sequence::MNG_UNKNOWN), - field_node_ (0) -{ - // Always the case. - this->has_constructor (true); -} - be_sequence::be_sequence (AST_Expression *v, AST_Type *t, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index b08d55a9cf9..b16aeb60867 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_string.h" #include "be_visitor.h" #include "be_helper.h" @@ -22,18 +21,6 @@ #include "utl_identifier.h" #include "global_extern.h" -be_string::be_string (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_String (), - be_decl (), - be_type () -{ - // Always the case. - this->size_type (AST_Type::VARIABLE); -} - be_string::be_string (AST_Decl::NodeType nt, UTL_ScopedName * n, AST_Expression * v, @@ -44,6 +31,8 @@ be_string::be_string (AST_Decl::NodeType nt, true), AST_Type (nt, n), + AST_ConcreteType (nt, + n), AST_String (nt, n, v, diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 53f4f8f0f91..39141f84456 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_structure.h" #include "be_field.h" #include "be_codegen.h" @@ -26,19 +25,6 @@ #include "idl_defines.h" #include "global_extern.h" -be_structure::be_structure (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure (), - be_scope (), - be_decl (), - be_type () -{ -} - be_structure::be_structure (UTL_ScopedName *n, bool local, bool abstract) @@ -66,6 +52,35 @@ be_structure::be_structure (UTL_ScopedName *n, } } +be_structure::be_structure (AST_Decl::NodeType nt, + UTL_ScopedName *n, + bool local, + bool abstract) + : COMMON_Base (local, + abstract), + AST_Decl (nt, + n), + AST_Type (nt, + n), + AST_ConcreteType (nt, + n), + UTL_Scope (nt), + AST_Structure (nt, + n, + local, + abstract), + be_scope (nt), + be_decl (nt, + n), + be_type (nt, + n) +{ + if (!this->imported ()) + { + idl_global->aggregate_seen_ = true; + } +} + void be_structure::redefine (AST_Structure *from) { diff --git a/TAO/TAO_IDL/be/be_structure_fwd.cpp b/TAO/TAO_IDL/be/be_structure_fwd.cpp index 95c216f3dba..6c3bf9d2559 100644 --- a/TAO/TAO_IDL/be/be_structure_fwd.cpp +++ b/TAO/TAO_IDL/be/be_structure_fwd.cpp @@ -13,20 +13,9 @@ */ //============================================================================= - #include "be_structure_fwd.h" #include "be_visitor.h" -be_structure_fwd::be_structure_fwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_StructureFwd (), - be_decl (), - be_type () -{ -} - be_structure_fwd::be_structure_fwd (AST_Structure *dummy, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_template_module.cpp b/TAO/TAO_IDL/be/be_template_module.cpp index 57842da91a4..86ada735c42 100644 --- a/TAO/TAO_IDL/be/be_template_module.cpp +++ b/TAO/TAO_IDL/be/be_template_module.cpp @@ -12,6 +12,8 @@ be_template_module::be_template_module ( n), UTL_Scope (AST_Decl::NT_module), AST_Module (n), + AST_Type (AST_Decl::NT_module, + n), AST_Template_Module (n, template_params), be_scope (AST_Decl::NT_module), diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index f330feed502..c17342ac563 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_type.h" #include "be_scope.h" #include "be_visitor.h" @@ -24,18 +23,6 @@ #include "idl_defines.h" #include "nr_extern.h" -be_type::be_type (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - be_decl (), - tc_name_ (0), - common_varout_gen_ (false), - seen_in_sequence_ (false), - seen_in_operation_ (false) -{ -} - be_type::be_type (AST_Decl::NodeType nt, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp index 2edcadcb358..4cd3107942b 100644 --- a/TAO/TAO_IDL/be/be_typedef.cpp +++ b/TAO/TAO_IDL/be/be_typedef.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_typedef.h" #include "be_visitor.h" #include "ace/Log_Msg.h" diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index d2d69650042..660bdf84aab 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_union.h" #include "be_union_branch.h" #include "be_union_label.h" @@ -29,22 +28,6 @@ #include "idl_defines.h" #include "global_extern.h" -be_union::be_union (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - UTL_Scope (), - AST_Structure (), - AST_Union (), - be_scope (), - be_decl (), - be_type () -{ - // Always the case. - this->has_constructor (true); -} - be_union::be_union (AST_ConcreteType *dt, UTL_ScopedName *n, bool local, diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp index 8b6fe6168cc..288f79e1fce 100644 --- a/TAO/TAO_IDL/be/be_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_union_branch.cpp @@ -14,7 +14,6 @@ */ //============================================================================= - #include "be_union_branch.h" #include "be_union.h" #include "be_type.h" @@ -24,16 +23,6 @@ #include "ast_union_label.h" #include "ace/Log_Msg.h" -be_union_branch::be_union_branch (void) - : COMMON_Base (), - AST_Decl (), - AST_Field (), - AST_UnionBranch (), - be_decl (), - be_field () -{ -} - be_union_branch::be_union_branch (UTL_LabelList *ll, AST_Type *ft, UTL_ScopedName *n) diff --git a/TAO/TAO_IDL/be/be_union_fwd.cpp b/TAO/TAO_IDL/be/be_union_fwd.cpp index ec2e1e0e539..316804de873 100644 --- a/TAO/TAO_IDL/be/be_union_fwd.cpp +++ b/TAO/TAO_IDL/be/be_union_fwd.cpp @@ -13,23 +13,10 @@ */ //============================================================================= - #include "be_union_fwd.h" #include "be_visitor.h" #include "ast_union.h" -be_union_fwd::be_union_fwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_StructureFwd (), - AST_UnionFwd (), - be_decl (), - be_type (), - be_structure_fwd () -{ -} - be_union_fwd::be_union_fwd (AST_Union *dummy, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp index 0707dfd59dd..af2906934d8 100644 --- a/TAO/TAO_IDL/be/be_union_label.cpp +++ b/TAO/TAO_IDL/be/be_union_label.cpp @@ -5,11 +5,6 @@ #include "be_union_label.h" #include "be_visitor.h" -be_union_label::be_union_label (void) - : AST_UnionLabel () -{ -} - be_union_label::be_union_label (AST_UnionLabel::UnionLabel ul, AST_Expression *v) : AST_UnionLabel (ul, v) diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index 13c2ea818e0..64980632d32 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -13,7 +13,6 @@ */ //============================================================================= - #include "be_util.h" #include "be_helper.h" #include "be_module.h" diff --git a/TAO/TAO_IDL/be/be_valuebox.cpp b/TAO/TAO_IDL/be/be_valuebox.cpp index b17bf779a25..f39483ddb34 100644 --- a/TAO/TAO_IDL/be/be_valuebox.cpp +++ b/TAO/TAO_IDL/be/be_valuebox.cpp @@ -13,34 +13,11 @@ */ //============================================================================= - #include "be_valuebox.h" #include "be_type.h" #include "be_visitor.h" #include "global_extern.h" -// Default constructor. -be_valuebox::be_valuebox (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_ConcreteType (), - AST_ValueBox (), - be_decl (), - be_type () -{ - // Always the case (according to C++ mapping specification). - this->size_type (AST_Type::VARIABLE); - - // Set the flag that says we have a valuetype in this IDL file. - // This allows the correct #include to be generated (see be_codegen.cpp). - idl_global->valuebase_seen_ = true; - - // Set the flag that says we have a valuetype in this IDL file. - // This allows the correct #include to be generated (see be_codegen.cpp). - idl_global->valuetype_seen_ = true; -} - be_valuebox::be_valuebox (AST_Type *boxed_type, UTL_ScopedName *n) : COMMON_Base (), diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 44106c23bc4..ff80bc34256 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -9,11 +9,10 @@ * additional means for C++ mapping of an valuetype. * * - * @author Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de> derived from be_interface.cpp + * @author Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de> */ //============================================================================= - #include "be_valuetype.h" #include "be_visitor.h" #include "be_extern.h" @@ -25,35 +24,6 @@ #include "global_extern.h" #include "ace/Log_Msg.h" -// Default constructor. -be_valuetype::be_valuetype (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - UTL_Scope (), - AST_Interface (), - be_scope (), - be_decl (), - be_type (), - be_interface (), - AST_ValueType (), - full_obv_skel_name_ (0) -{ - // Always the case. - this->size_type (AST_Type::VARIABLE); - - AST_Module *m = AST_Module::narrow_from_scope (this->defined_in ()); - - if (m != 0) - { - m->set_has_nested_valuetype (); - } - - // Always the case. - this->has_constructor (true); -} - -// Constructor used to build the AST. be_valuetype::be_valuetype (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp index 287b2d40317..865b318377f 100644 --- a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp @@ -9,29 +9,15 @@ * means for C++ mapping of an valuetype. * * - * @author Copyright 1994-1995 by Sun Microsystems - * @author Inc. and Aniruddha Gokhale changed for valuetypes by Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de> + * @author Copyright 1994-1995 by Sun Microsystems Inc. + * @author Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de> */ //============================================================================= - - #include "be_valuetype_fwd.h" #include "be_visitor.h" #include "ast_interface.h" -be_valuetype_fwd::be_valuetype_fwd (void) - : COMMON_Base (), - AST_Decl (), - AST_Type (), - AST_InterfaceFwd (), - be_decl (), - be_type (), - be_interface_fwd (), - AST_ValueTypeFwd () -{ -} - be_valuetype_fwd::be_valuetype_fwd (AST_Interface *dummy, UTL_ScopedName *n) : COMMON_Base (dummy->is_local (), diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h index d27995d6081..369b6fc3587 100644 --- a/TAO/TAO_IDL/be_include/be_argument.h +++ b/TAO/TAO_IDL/be_include/be_argument.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_ARGUMENT_H #define BE_ARGUMENT_H @@ -28,10 +27,6 @@ class be_argument : public virtual AST_Argument, public virtual be_decl { public: - // Default constructor. - be_argument (void); - - // Constructor. be_argument (AST_Argument::Direction d, AST_Type *ft, UTL_ScopedName *n); @@ -43,7 +38,6 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_argument); }; diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index 7a360d3ae06..4850ebe3a7f 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -29,8 +29,6 @@ class be_array : public virtual AST_Array, public virtual be_type { public: - be_array (void); - be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims, diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h index 7df4bcf28e4..9fbbe54956d 100644 --- a/TAO/TAO_IDL/be_include/be_attribute.h +++ b/TAO/TAO_IDL/be_include/be_attribute.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_ATTRIBUTE_H #define BE_ATTRIBUTE_H @@ -29,8 +28,6 @@ class be_attribute : public virtual AST_Attribute, public virtual be_decl { public: - be_attribute (void); - be_attribute (bool ro, AST_Type *ft, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h index 0ce240cdd5a..35f22413299 100644 --- a/TAO/TAO_IDL/be_include/be_component.h +++ b/TAO/TAO_IDL/be_include/be_component.h @@ -30,8 +30,6 @@ class be_component : public virtual AST_Component, // = DESCRIPTION // public: - be_component (void); - be_component (UTL_ScopedName *n, AST_Component *base_component, AST_Type **supports, diff --git a/TAO/TAO_IDL/be_include/be_component_fwd.h b/TAO/TAO_IDL/be_include/be_component_fwd.h index 0c788a33b46..084f6ea574c 100644 --- a/TAO/TAO_IDL/be_include/be_component_fwd.h +++ b/TAO/TAO_IDL/be_include/be_component_fwd.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_COMPONENT_FWD_H #define BE_COMPONENT_FWD_H @@ -30,8 +29,6 @@ class be_component_fwd : public virtual AST_ComponentFwd, // =DESCRIPTION // Extensions to the AST_ComponentFwd class public: - be_component_fwd (void); - be_component_fwd (AST_Interface *dummy, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h index ad1068d15a8..acbe89e5095 100644 --- a/TAO/TAO_IDL/be_include/be_constant.h +++ b/TAO/TAO_IDL/be_include/be_constant.h @@ -28,10 +28,6 @@ class be_constant : public virtual AST_Constant, public virtual be_decl { public: - /// Constructor. - be_constant (void); - - /// Constructor. be_constant (AST_Expression::ExprType et, AST_Expression *v, UTL_ScopedName *n); @@ -43,9 +39,7 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_constant); - }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h index 98a1beb1f4d..68a6bbf0442 100644 --- a/TAO/TAO_IDL/be_include/be_decl.h +++ b/TAO/TAO_IDL/be_include/be_decl.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef TAO_BE_DECL_H #define TAO_BE_DECL_H @@ -35,14 +34,9 @@ class be_type; class be_decl : public virtual AST_Decl { public: - /// Default constructor. - be_decl (void); - - /// Constructor that sets the node type. be_decl (AST_Decl::NodeType type, UTL_ScopedName *n); - /// Destructor. ~be_decl (void); // Methods used by the interface type strategy. diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 813730f065f..95eeb8217d1 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef BE_ENUM_H #define BE_ENUM_H @@ -30,10 +29,6 @@ class be_enum : public virtual AST_Enum, public virtual be_type { public: - /// Default constructor. - be_enum (void); - - /// Constructor. be_enum (UTL_ScopedName *n, bool local, bool abstract); @@ -49,7 +44,6 @@ public: virtual int accept (be_visitor *visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_enum); DEF_NARROW_FROM_SCOPE (be_enum); }; diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h index 0b5ca13888b..e757c2a6699 100644 --- a/TAO/TAO_IDL/be_include/be_enum_val.h +++ b/TAO/TAO_IDL/be_include/be_enum_val.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef BE_ENUM_VAL_H #define BE_ENUM_VAL_H @@ -28,10 +27,6 @@ class be_enum_val : public virtual AST_EnumVal, public virtual be_decl { public: - /// Default constructor. - be_enum_val (void); - - /// Constructor. be_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n); @@ -42,7 +37,6 @@ public: virtual void destroy (void); // Narrowing - DEF_NARROW_FROM_DECL (be_enum_val); }; diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h index a18234fa825..1a4a4582c6d 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype.h +++ b/TAO/TAO_IDL/be_include/be_eventtype.h @@ -13,7 +13,6 @@ */ //============================================================================= - #ifndef TAO_BE_EVENTTYPE_H #define TAO_BE_EVENTTYPE_H @@ -30,11 +29,6 @@ class be_eventtype : public virtual be_valuetype, // Extends be_valuetype. // public: - /// Default constructor. - be_eventtype (void); - - /// Constructor that sets its scoped name <n>, a list of inherited valuetypes - /// and supported interfaces <ih>, and the number of inherited interfaces <nih> be_eventtype (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, @@ -48,7 +42,6 @@ public: bool truncatable, bool custom); - /// Destructor. ~be_eventtype (void); // Visiting. @@ -57,8 +50,7 @@ public: // Cleanup. virtual void destroy (void); - // Narrowing. - + // Narrowing. DEF_NARROW_FROM_DECL (be_eventtype); DEF_NARROW_FROM_SCOPE (be_eventtype); }; diff --git a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h index 2aad719f180..e43fd9ff48c 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h +++ b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_EVENTTYPE_FWD_H #define BE_EVENTTYPE_FWD_H @@ -30,14 +29,9 @@ class be_eventtype_fwd : public virtual be_valuetype_fwd, // =DESCRIPTION // Extensions to the be_interface_fwd class public: - /// Default constructor. - be_eventtype_fwd (void); - - /// Constructor. be_eventtype_fwd (AST_Interface *dummy, UTL_ScopedName *n); - /// Destructor. virtual ~be_eventtype_fwd (void); // Visiting. @@ -47,7 +41,6 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_eventtype_fwd); }; diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h index 47b9a66a9e6..97e0fb8b5d0 100644 --- a/TAO/TAO_IDL/be_include/be_exception.h +++ b/TAO/TAO_IDL/be_include/be_exception.h @@ -13,8 +13,6 @@ class be_exception : public virtual AST_Exception, { public: - be_exception (void); - be_exception (UTL_ScopedName *n, bool local, bool abstract); @@ -26,7 +24,6 @@ public: virtual int accept (be_visitor *visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_exception); DEF_NARROW_FROM_SCOPE (be_exception); }; diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h index 0e68dd8afd0..3a04d9f38aa 100644 --- a/TAO/TAO_IDL/be_include/be_factory.h +++ b/TAO/TAO_IDL/be_include/be_factory.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_FACTORY_H #define BE_FACTORY_H @@ -32,8 +31,6 @@ class be_factory : public virtual AST_Factory, public virtual be_decl { public: - be_factory (void); - be_factory (UTL_ScopedName *n); ~be_factory (void); diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h index 5d2cad14525..a2654588c19 100644 --- a/TAO/TAO_IDL/be_include/be_field.h +++ b/TAO/TAO_IDL/be_include/be_field.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_FIELD_H #define BE_FIELD_H @@ -28,8 +27,6 @@ class be_field : public virtual AST_Field, public virtual be_decl { public: - be_field (void); - be_field (AST_Type *ft, UTL_ScopedName *n, Visibility vis = vis_NA); diff --git a/TAO/TAO_IDL/be_include/be_home.h b/TAO/TAO_IDL/be_include/be_home.h index c1d6d5f4294..381dee6bb32 100644 --- a/TAO/TAO_IDL/be_include/be_home.h +++ b/TAO/TAO_IDL/be_include/be_home.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef TAO_BE_HOME_H #define TAO_BE_HOME_H @@ -30,8 +29,6 @@ class be_home : public virtual AST_Home, // =DESCRIPTION // Extensions to the AST_Home class public: - be_home (void); - be_home (UTL_ScopedName *n, AST_Home *base_home, AST_Component *managed_component, diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index c9886150f8c..4319edece05 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -16,7 +16,6 @@ */ //============================================================================= - #ifndef TAO_BE_INTERFACE_H #define TAO_BE_INTERFACE_H @@ -53,11 +52,6 @@ public: be_interface *, TAO_OutStream *); - /// Default constructor. - be_interface (void); - - /// Constructor that sets its scoped name <n>, a list of inherited interfaces - /// <ih>, the number of inherited interfaces <nih>, and any prgmas <p>. be_interface (UTL_ScopedName *n, AST_Type **ih, long nih, diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h index 7795e35335b..831e825b14f 100644 --- a/TAO/TAO_IDL/be_include/be_interface_fwd.h +++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef BE_INTERFACE_FWD_H #define BE_INTERFACE_FWD_H @@ -34,14 +33,9 @@ class be_interface_fwd : public virtual AST_InterfaceFwd, // =DESCRIPTION // Extensions to the AST_InterfaceFwd class public: - /// Default constructor. - be_interface_fwd (void); - - /// Constructor. be_interface_fwd (AST_Interface *dummy, UTL_ScopedName *n); - /// Destructor. virtual ~be_interface_fwd (void); /// Mutator overrides for be_type members. If we have been @@ -56,7 +50,6 @@ public: virtual int accept (be_visitor* visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_interface_fwd); }; diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h index bbd13fdc058..7a78fa4cfe2 100644 --- a/TAO/TAO_IDL/be_include/be_module.h +++ b/TAO/TAO_IDL/be_include/be_module.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef _BE_MODULE_H #define _BE_MODULE_H @@ -30,10 +29,6 @@ class be_module : public virtual AST_Module, public virtual be_decl { public: - /// Default constructor. - be_module (void); - - /// Constructor. be_module (UTL_ScopedName *n); /// Cleanup method. @@ -43,7 +38,6 @@ public: virtual int accept (be_visitor *visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_module); DEF_NARROW_FROM_SCOPE (be_module); }; diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h index b8850f92674..f3b032f5187 100644 --- a/TAO/TAO_IDL/be_include/be_native.h +++ b/TAO/TAO_IDL/be_include/be_native.h @@ -12,8 +12,6 @@ */ //============================================================================= - - #ifndef BE_NATIVE_H #define BE_NATIVE_H @@ -33,13 +31,8 @@ class be_native : public virtual AST_Native, public virtual be_exception { public: - /// Default constructor. - be_native (void); - - /// Constructor that initializes its scoped name. be_native (UTL_ScopedName *n); - /// Destructor virtual ~be_native (void) {} /// Generate the typecode description. @@ -55,7 +48,6 @@ public: virtual int accept (be_visitor *visitor); // Narrowing. - DEF_NARROW_FROM_DECL(be_native); }; diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h index 9d34b878868..9520ad89411 100644 --- a/TAO/TAO_IDL/be_include/be_operation.h +++ b/TAO/TAO_IDL/be_include/be_operation.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_OPERATION_H #define BE_OPERATION_H @@ -33,17 +32,12 @@ class be_operation : public virtual AST_Operation, public virtual be_decl { public: - /// Default constructor. - be_operation (void); - - /// Constructor be_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n, bool local, bool abstract); - /// Destructor. ~be_operation (void); /// Cleanup method. diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h index 307b11c0eab..a99a423e2d5 100644 --- a/TAO/TAO_IDL/be_include/be_predefined_type.h +++ b/TAO/TAO_IDL/be_include/be_predefined_type.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef _BE_PREDEFINED_TYPE_H #define _BE_PREDEFINED_TYPE_H @@ -28,8 +27,6 @@ class be_predefined_type : public virtual AST_PredefinedType, public virtual be_type { public: - be_predefined_type (void); - be_predefined_type (AST_PredefinedType::PredefinedType t, UTL_ScopedName *n); @@ -46,7 +43,6 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_predefined_type); protected: diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h index 0a6ea46826a..e14d0d36e2e 100644 --- a/TAO/TAO_IDL/be_include/be_root.h +++ b/TAO/TAO_IDL/be_include/be_root.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef TAO_BE_ROOT_H #define TAO_BE_ROOT_H @@ -34,10 +33,6 @@ class be_root : public virtual AST_Root, // = DESCRIPTION // public: - /// Default constructor. - be_root (void); - - /// Constructor that sets its scoped name <n>, and any pragmas <p>. be_root (UTL_ScopedName *n); virtual ~be_root (void); @@ -49,7 +44,6 @@ public: virtual int accept (be_visitor *visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_root); DEF_NARROW_FROM_SCOPE (be_root); }; diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 3924e342304..7fb1e13588e 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -16,7 +16,6 @@ */ //============================================================================= - #ifndef BE_SEQUENCE_H #define BE_SEQUENCE_H @@ -51,8 +50,6 @@ public: MNG_PSEUDO }; - be_sequence (void); - be_sequence (AST_Expression *v, AST_Type *bt, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h index 6de843073d6..3cb7fd6ef8b 100644 --- a/TAO/TAO_IDL/be_include/be_string.h +++ b/TAO/TAO_IDL/be_include/be_string.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_STRING_H #define BE_STRING_H @@ -28,8 +27,6 @@ class be_string : public virtual AST_String, public virtual be_type { public: - be_string (void); - be_string (AST_Decl::NodeType nt, UTL_ScopedName *n, AST_Expression *v, diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index 3c12c699c4a..4a36b7e63a5 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef BE_STRUCTURE_H #define BE_STRUCTURE_H @@ -30,12 +29,15 @@ class be_structure : public virtual AST_Structure, public virtual be_type { public: - be_structure (void); - be_structure (UTL_ScopedName *n, bool local, bool abstract); + be_structure (AST_Decl::NodeType nt, + UTL_ScopedName *n, + bool local, + bool abstract); + /// Copy BE-specific values when redefining struct or union /// from a forward declaration. virtual void redefine (AST_Structure *from); diff --git a/TAO/TAO_IDL/be_include/be_structure_fwd.h b/TAO/TAO_IDL/be_include/be_structure_fwd.h index c4452a3a1b0..501c0e61bb4 100644 --- a/TAO/TAO_IDL/be_include/be_structure_fwd.h +++ b/TAO/TAO_IDL/be_include/be_structure_fwd.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_STRUCTURE_FWD_H #define BE_STRUCTURE_FWD_H @@ -33,14 +32,9 @@ class be_structure_fwd : public virtual AST_StructureFwd, // =DESCRIPTION // Extensions to the AST_StructureFwd class public: - /// Default constructor. - be_structure_fwd (void); - - /// Constructor. be_structure_fwd (AST_Structure *dummy, UTL_ScopedName *n); - /// Destructor. virtual ~be_structure_fwd (void); /// Cleanup function. @@ -50,7 +44,6 @@ public: virtual int accept (be_visitor* visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_structure_fwd); }; diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index e5d65fe91aa..b32615904ca 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_TYPE_H #define BE_TYPE_H @@ -29,14 +28,9 @@ class be_type : public virtual AST_Type, public virtual be_decl { public: - /// Default constructor. - be_type (void); - - /// Constructor. be_type (AST_Decl::NodeType nt, UTL_ScopedName *n); - /// Destructor. virtual ~be_type (void); /** diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h index 4481b1ad0b2..7bbf18737c7 100644 --- a/TAO/TAO_IDL/be_include/be_typedef.h +++ b/TAO/TAO_IDL/be_include/be_typedef.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_TYPEDEF_H #define BE_TYPEDEF_H @@ -27,7 +26,6 @@ class be_typedef : public virtual AST_Typedef, public virtual be_type { public: - /// Constructor. be_typedef (AST_Type *bt, UTL_ScopedName *n, bool l, diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h index dba4076268d..dc844990c4d 100644 --- a/TAO/TAO_IDL/be_include/be_union.h +++ b/TAO/TAO_IDL/be_include/be_union.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_UNION_H #define BE_UNION_H @@ -30,8 +29,6 @@ class be_union : public virtual AST_Union, public virtual be_type { public: - be_union (void); - be_union (AST_ConcreteType *dt, UTL_ScopedName *n, bool local, diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h index e1c5b10a472..33341ef8d22 100644 --- a/TAO/TAO_IDL/be_include/be_union_branch.h +++ b/TAO/TAO_IDL/be_include/be_union_branch.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_UNION_BRANCH_H #define BE_UNION_BRANCH_H @@ -31,10 +30,6 @@ class be_union_branch : public virtual AST_UnionBranch, public virtual be_field { public: - /// default constructor. - be_union_branch (void); - - /// Constructor. be_union_branch (UTL_LabelList *ll, AST_Type *ft, UTL_ScopedName *n); @@ -54,7 +49,6 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_union_branch); }; diff --git a/TAO/TAO_IDL/be_include/be_union_fwd.h b/TAO/TAO_IDL/be_include/be_union_fwd.h index b8001228243..a820d394582 100644 --- a/TAO/TAO_IDL/be_include/be_union_fwd.h +++ b/TAO/TAO_IDL/be_include/be_union_fwd.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef BE_UNION_FWD_H #define BE_UNION_FWD_H @@ -32,14 +31,9 @@ class be_union_fwd : public virtual AST_UnionFwd, // =DESCRIPTION // Extensions to the AST_UnionFwd class public: - /// Default constructor. - be_union_fwd (void); - - /// Constructor. be_union_fwd (AST_Union *dummy, UTL_ScopedName *n); - /// Destructor. virtual ~be_union_fwd (void); /// Cleanup function. @@ -49,7 +43,6 @@ public: virtual int accept (be_visitor* visitor); // Narrowing. - DEF_NARROW_FROM_DECL (be_union_fwd); }; diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h index f115041e10e..1c5c6855398 100644 --- a/TAO/TAO_IDL/be_include/be_union_label.h +++ b/TAO/TAO_IDL/be_include/be_union_label.h @@ -10,12 +10,8 @@ class be_visitor; class be_union_label : public virtual AST_UnionLabel { public: - be_union_label (void); - // Default constructor. - be_union_label (AST_UnionLabel::UnionLabel ul, AST_Expression *v); - // Constructor. // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_valuebox.h b/TAO/TAO_IDL/be_include/be_valuebox.h index b1cf8aea438..4679b4ee117 100644 --- a/TAO/TAO_IDL/be_include/be_valuebox.h +++ b/TAO/TAO_IDL/be_include/be_valuebox.h @@ -13,7 +13,6 @@ */ //============================================================================= - #ifndef TAO_BE_VALUEBOX_H #define TAO_BE_VALUEBOX_H @@ -27,10 +26,6 @@ class be_valuebox : public virtual AST_ValueBox, public virtual be_type { public: - /// Default constructor. - be_valuebox (void); - - /// Constructor. be_valuebox ( AST_Type *boxed_type, UTL_ScopedName *n ); @@ -41,7 +36,6 @@ public: virtual void destroy (void); // Narrowing - DEF_NARROW_FROM_DECL (be_valuebox); }; diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h index 91cc2170d79..20dbe690da0 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_valuetype.h @@ -13,7 +13,6 @@ */ //============================================================================= - #ifndef TAO_BE_VALUETYPE_H #define TAO_BE_VALUETYPE_H @@ -34,11 +33,6 @@ class be_valuetype : public virtual be_interface, // mapping. // public: - /// Default constructor. - be_valuetype (void); - - /// Constructor that sets its scoped name <n>, a list of inherited valuetypes - /// and supported interfaces <ih>, and the number of inherited interfaces <nih> be_valuetype (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, @@ -52,7 +46,6 @@ public: bool truncatable, bool custom); - /// Destructor. ~be_valuetype (void); virtual void redefine (AST_Interface *from); diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h index e12d56140bc..5f14bd11834 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h +++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h @@ -10,13 +10,12 @@ * means for C++ mapping of a valuetype. * * - * @author Copyright 1994-1995 by Sun Microsystems - * @author Inc. and Aniruddha Gokhale - * @author changed for valuetypes from Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de> + * @author Copyright 1994-1995 by Sun Microsystems Inc. + * @author Aniruddha Gokhale + * @author Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de> */ //============================================================================= - #ifndef BE_VALUETYPE_FWD_H #define BE_VALUETYPE_FWD_H @@ -32,14 +31,9 @@ class be_valuetype_fwd : public virtual be_interface_fwd, // =DESCRIPTION // Extensions to the be_interface_fwd class public: - /// Default constructor. - be_valuetype_fwd (void); - - /// Constructor. be_valuetype_fwd (AST_Interface *dummy, UTL_ScopedName *n); - /// Destructor. virtual ~be_valuetype_fwd (void); // Visiting. @@ -49,7 +43,6 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_valuetype_fwd); }; diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index d97411eb9d7..602be943cc9 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -84,16 +84,10 @@ public: dir_INOUT = 0x04 }; - // Operations. - - // Constructor(s). - AST_Argument (void); - AST_Argument (Direction direction, AST_Type *ft, UTL_ScopedName *n); - // Destructor. virtual ~AST_Argument (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 5f70b4e7498..5ba744a4fe0 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -82,18 +82,12 @@ class ast_visitor; class TAO_IDL_FE_Export AST_Array : public virtual AST_ConcreteType { public: - // Operations. - - // Constructor(s). - AST_Array (void); - AST_Array (UTL_ScopedName *n, ACE_CDR::ULong ndims, UTL_ExprList *dims, bool local, bool abstract); - // Destructor. virtual ~AST_Array (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index 4c721ef30dd..abdcbdc85ce 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -76,18 +76,12 @@ class UTL_NameList; class TAO_IDL_FE_Export AST_Attribute : public virtual AST_Field { public: - // Operations. - - // Constructor(s). - AST_Attribute (void); - AST_Attribute (bool readonly, AST_Type *ft, UTL_ScopedName *n, bool local, bool abstract); - // Destructor. virtual ~AST_Attribute (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index ee2a346f91c..820be69593f 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -19,8 +19,6 @@ class TAO_IDL_FE_Export AST_Component : public virtual AST_Interface { public: - AST_Component (void); - AST_Component (UTL_ScopedName *n, AST_Component *base_component, AST_Type **supports, diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h index f1dc89eb467..7b2f355925a 100644 --- a/TAO/TAO_IDL/include/ast_component_fwd.h +++ b/TAO/TAO_IDL/include/ast_component_fwd.h @@ -11,8 +11,6 @@ class TAO_IDL_FE_Export AST_ComponentFwd : public virtual AST_InterfaceFwd { public: - AST_ComponentFwd (void); - AST_ComponentFwd (AST_Interface *dummy, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 65344dc2bec..44e961be886 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -75,22 +75,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export AST_ConcreteType : public virtual AST_Type { public: - // Operations. - - // Constructor(s). - AST_ConcreteType (void); - AST_ConcreteType (AST_Decl::NodeType nt, UTL_ScopedName *n); - // Destructor. virtual ~AST_ConcreteType (void); // Cleanup. virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL(AST_ConcreteType); }; diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index 3303fb468ed..9a291f565f3 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -84,8 +84,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export AST_Constant : public virtual AST_Decl { public: - AST_Constant (void); - AST_Constant (AST_Expression::ExprType et, AST_Decl::NodeType nt, AST_Expression *ev, diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index f3396d4f21c..58aa779927a 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -95,7 +95,6 @@ class ast_visitor; class TAO_IDL_FE_Export COMMON_Base { public: - COMMON_Base (bool local = false, bool abstract = false); @@ -111,9 +110,6 @@ public: // A no-op, overridden in the child classes. virtual void destroy (void); - // Narrowing. - - protected: bool is_local_; bool is_abstract_; @@ -174,11 +170,6 @@ public: , NT_param_holder // Denotes a template param placeholder }; - // Operations. - - // Constructor(s). - AST_Decl (void); - AST_Decl (NodeType type, UTL_ScopedName *n, bool anonymous = false); diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index adf69fa5d35..61e6fd49fb8 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -72,11 +72,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class AST_EnumVal; -class TAO_IDL_FE_Export AST_Enum : public virtual AST_ConcreteType, - public virtual UTL_Scope +class TAO_IDL_FE_Export AST_Enum + : public virtual AST_ConcreteType, + public virtual UTL_Scope { public: - AST_Enum (void); AST_Enum (UTL_ScopedName *n, bool local, bool abstract); diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h index a5a3af9c675..862ff167f26 100644 --- a/TAO/TAO_IDL/include/ast_enum_val.h +++ b/TAO/TAO_IDL/include/ast_enum_val.h @@ -74,19 +74,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export AST_EnumVal : public virtual AST_Constant { public: - // Operations. - - // Constructor(s). - AST_EnumVal (void); - AST_EnumVal (ACE_CDR::ULong v, UTL_ScopedName *n); - // Destructor. virtual ~AST_EnumVal (void); // Narrowing. - DEF_NARROW_FROM_DECL(AST_EnumVal); // AST Dumping. diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h index 4ee1e3a995f..c002947fd6d 100644 --- a/TAO/TAO_IDL/include/ast_eventtype.h +++ b/TAO/TAO_IDL/include/ast_eventtype.h @@ -9,8 +9,6 @@ class TAO_IDL_FE_Export AST_EventType : public virtual AST_ValueType { public: - AST_EventType (void); - AST_EventType (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h index 38bbcfc408a..1d7f9fe27d8 100644 --- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h +++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h @@ -11,8 +11,6 @@ class TAO_IDL_FE_Export AST_EventTypeFwd : public virtual AST_ValueTypeFwd { public: - AST_EventTypeFwd (void); - AST_EventTypeFwd (AST_Interface *dummy, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index 99f31f207c7..f70a512353c 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -80,8 +80,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export AST_Exception : public virtual AST_Structure { public: - AST_Exception (void); - AST_Exception (UTL_ScopedName *n, bool local, bool abstract); diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h index 0bee1e12d4f..1f9fc6bcfbd 100644 --- a/TAO/TAO_IDL/include/ast_factory.h +++ b/TAO/TAO_IDL/include/ast_factory.h @@ -80,19 +80,10 @@ class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl, public virtual UTL_Scope { public: - - // Constructor(s). - AST_Factory (void); - AST_Factory (UTL_ScopedName *n); - // Destructor. virtual ~AST_Factory (void); - // Data Accessors. - - // Public operations. - UTL_ExceptList *exceptions (void); // Return exception list. diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index f2bcf39eec4..8641de10063 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -91,11 +91,6 @@ public: vis_PRIVATE }; - // Operations. - - // Constructor(s). - AST_Field (void); - AST_Field (AST_Type *field_type, UTL_ScopedName *n, Visibility vis = vis_NA); diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index ae0379dd431..4d7f38ae283 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -13,8 +13,6 @@ class AST_ValueType; class TAO_IDL_FE_Export AST_Home : public virtual AST_Interface { public: - AST_Home (void); - AST_Home (UTL_ScopedName *n, AST_Home *base_home, AST_Component *managed_component, diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index c9fd4533202..1f6e97c0042 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -78,8 +78,6 @@ class TAO_IDL_FE_Export AST_Interface : public virtual AST_Type, public virtual UTL_Scope { public: - AST_Interface (void); - AST_Interface (UTL_ScopedName *n, AST_Type **ih, long nih, @@ -226,8 +224,7 @@ protected: // Lookup based on the local name, override of UTL_Scope definition. // This version checks for redefinitions of attributes or operations. - AST_Decl *lookup_for_add (AST_Decl *d, - bool treat_as_ref); + AST_Decl *lookup_for_add (AST_Decl *d); void redef_clash_populate_r (AST_Type *t); // Populate the insert queue with our parents, and, if we are a diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index 7aeea93db91..0722940a66d 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -76,8 +76,6 @@ class AST_Interface; class TAO_IDL_FE_Export AST_InterfaceFwd : public virtual AST_Type { public: - AST_InterfaceFwd (void); - AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 1918a7d8cf7..8c0a9acc51f 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -81,17 +81,11 @@ class TAO_IDL_FE_Export AST_Module : public virtual AST_Decl, public virtual UTL_Scope { public: - // Operations. - - // Constructor(s) and destructor. - AST_Module (void); - AST_Module (UTL_ScopedName *n); virtual ~AST_Module (void); // Narrowing. - DEF_NARROW_FROM_DECL(AST_Module); DEF_NARROW_FROM_SCOPE(AST_Module); diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 6d79ca8a5ee..7b831c8f419 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -15,24 +15,14 @@ class TAO_IDL_FE_Export AST_Native : public virtual AST_Exception { public: - // Operations. - - // Constructor(s). - - AST_Native (void); - // Default constructor. - AST_Native (UTL_ScopedName *n); - // Constructor that initializes the scoped name. virtual ~AST_Native (void); - // Destructor. - virtual void destroy (void); // Cleanup. + virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL(AST_Native); // AST Dumping. diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index 48d0077e3c0..75fae11e3de 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -85,16 +85,12 @@ public: , OP_idempotent // Operation is idempotent. }; - // Constructor(s). - AST_Operation (void); - AST_Operation (AST_Type *return_type, Flags flags, UTL_ScopedName *n, bool local, bool abstract); - // Destructor. virtual ~AST_Operation (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 24e48d991a2..d5a4860fd4f 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -98,11 +98,6 @@ public: , PT_pseudo // Predefined type for pseudo objects }; - // Operations. - - // Constructor(s). - AST_PredefinedType (void); - AST_PredefinedType (PredefinedType t, UTL_ScopedName *n); @@ -112,7 +107,6 @@ public: PredefinedType pt (void); // Narrowing - DEF_NARROW_FROM_DECL(AST_PredefinedType); // AST Dumping diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h index 90e39ee64c4..06560ecbac6 100644 --- a/TAO/TAO_IDL/include/ast_root.h +++ b/TAO/TAO_IDL/include/ast_root.h @@ -74,8 +74,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export AST_Root : public virtual AST_Module { public: - AST_Root (void); - AST_Root (UTL_ScopedName *n); virtual ~AST_Root (void); diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index 70f54e134ce..f0a9e7dfedb 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -73,13 +73,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class AST_Expression; class AST_Type; -// A sequence is a combination of a maximum size and a base type. - class TAO_IDL_FE_Export AST_Sequence : public virtual AST_ConcreteType { public: - AST_Sequence (void); - AST_Sequence (AST_Expression *max_size, AST_Type *bt, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h index c11d73324e0..76b73c2e00b 100644 --- a/TAO/TAO_IDL/include/ast_string.h +++ b/TAO/TAO_IDL/include/ast_string.h @@ -78,11 +78,6 @@ class AST_Expression; class TAO_IDL_FE_Export AST_String : public virtual AST_ConcreteType { public: - // Operations. - - // Constructor(s) and destructor - AST_String (void); - AST_String (AST_Decl::NodeType nt, UTL_ScopedName *n, AST_Expression *max_size, @@ -95,7 +90,6 @@ public: long width (void); // Narrowing. - DEF_NARROW_FROM_DECL(AST_String); // AST Dumping. diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index bdd952aa5c4..7539b64c5a7 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -81,12 +81,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_scope.h" #include "ace/Unbounded_Queue.h" -class TAO_IDL_FE_Export AST_Structure : public virtual AST_ConcreteType, - public virtual UTL_Scope +class TAO_IDL_FE_Export AST_Structure + : public virtual AST_ConcreteType, + public virtual UTL_Scope { public: - AST_Structure (void); - AST_Structure (UTL_ScopedName *n, bool local, bool abstract); diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index e0ccf980c36..20a7ec23306 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -13,8 +13,6 @@ class AST_Structure; class TAO_IDL_FE_Export AST_StructureFwd : public virtual AST_Type { public: - AST_StructureFwd (void); - AST_StructureFwd (AST_Structure *full_defn, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index d857b679292..0dda0c76988 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -88,10 +88,6 @@ public: // Indicates if we are fixed size or variable. Most useful for structs, // unions, and arrays. - // Operations. - - AST_Type (void); - AST_Type (AST_Decl::NodeType nt, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index b9c3627a8f1..9be71f68e60 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -80,17 +80,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export AST_Union : public virtual AST_Structure { public: - // Operations. - - // Constructor(s). - AST_Union (void); - AST_Union (AST_ConcreteType *disc_type, UTL_ScopedName *n, bool local, bool abstract); - // Destructor. virtual ~AST_Union (void); // This also calls the base class version. @@ -106,7 +100,6 @@ public: AST_Expression::ExprType udisc_type (void); // Narrowing. - DEF_NARROW_FROM_DECL(AST_Union); DEF_NARROW_FROM_SCOPE(AST_Union); diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index 3d36f980f90..55f74848e89 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -81,11 +81,6 @@ class AST_Union; class TAO_IDL_FE_Export AST_UnionBranch : public virtual AST_Field { public: - // Operations. - - // Constructor(s) and destructor. - AST_UnionBranch (void); - AST_UnionBranch (UTL_LabelList *ll, AST_Type *ft, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h index d1a39d78cb2..361af5dbdb1 100644 --- a/TAO/TAO_IDL/include/ast_union_fwd.h +++ b/TAO/TAO_IDL/include/ast_union_fwd.h @@ -13,8 +13,6 @@ class AST_Union; class TAO_IDL_FE_Export AST_UnionFwd : public virtual AST_StructureFwd { public: - AST_UnionFwd (void); - AST_UnionFwd (AST_Union *dummy, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index 580c90d2a2f..ac25a7ca945 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -85,8 +85,6 @@ public: , UL_label }; - AST_UnionLabel (void); - AST_UnionLabel (UnionLabel lk, AST_Expression *lv); diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h index 56d791c81ad..450d42c29b6 100644 --- a/TAO/TAO_IDL/include/ast_valuebox.h +++ b/TAO/TAO_IDL/include/ast_valuebox.h @@ -9,10 +9,6 @@ class TAO_IDL_FE_Export AST_ValueBox : public virtual AST_ConcreteType { public: - - // Constructor(s) and destructor. - AST_ValueBox (void); - AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type); @@ -22,7 +18,6 @@ public: AST_Type *boxed_type (void) const; // Narrowing. - DEF_NARROW_FROM_DECL(AST_ValueBox); // AST Dumping. diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index e412e31d614..d9400bfb8bd 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -10,8 +10,6 @@ class TAO_IDL_FE_Export AST_ValueType : public virtual AST_Interface { public: - AST_ValueType (void); - AST_ValueType (UTL_ScopedName *n, AST_Type **inherits, long n_inherits, diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h index dc455c3915d..e77ebafae5f 100644 --- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h +++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h @@ -11,8 +11,6 @@ class TAO_IDL_FE_Export AST_ValueTypeFwd : public virtual AST_InterfaceFwd { public: - AST_ValueTypeFwd (void); - AST_ValueTypeFwd (AST_Interface *dummy, UTL_ScopedName *n); diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index cf9c8edb1c2..418d19e50ce 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -260,8 +260,7 @@ protected: bool treat_as_ref); // Lookup based on the local name. - AST_Decl *lookup_for_add (AST_Decl *d, - bool treat_as_ref); + AST_Decl *lookup_for_add (AST_Decl *d); // Is there a (case-insensitive) clash between a local name // and an IDL keyword? @@ -483,6 +482,17 @@ private: /// Encapsulates the vagaries of adding fields vs decls to /// structs/unions vs other types. void smart_local_add (AST_Decl *t); + + /// Quick check on the head of a name to see if it's global. + bool is_global_name (Identifier *i); + + /// Helper function for lookup_by_name(). Iterates doing local + /// lookups of subsequent components of a scoped name. + AST_Decl * + iter_lookup_by_name_local (AST_Decl *d, + UTL_ScopedName *e, + long index, + bool full_def_only = false); }; // Active iterator for a UTL_Scope node diff --git a/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp b/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp index b1b79f38411..f66dbd45f97 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp +++ b/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp @@ -11,7 +11,7 @@ UTL_Scope::fe_add_full_intf_decl (DECL *t) DECL *fwd = 0; // Already defined? - if ((predef = this->lookup_for_add (t, false)) != 0) + if ((predef = this->lookup_for_add (t)) != 0) { // Treat fwd declared interfaces specially if (predef->node_type () == DECL::NT) @@ -103,12 +103,12 @@ UTL_Scope::fe_add_fwd_intf_decl (typename FULL_DECL::FWD_TYPE *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, false)) != 0) + if ((d = this->lookup_for_add (t)) != 0) { AST_Decl::NodeType nt = d->node_type (); // There used to be another check here ANDed with the one below: - // d->defined_in () == this. But lookup_for_add calls only + // d->defined_in () == this. But lookup_for_add() calls only // lookup_by_name_local(), which does not bump up the scope, // and look_in_previous() for modules. If look_in_previous() // finds something, the scopes will NOT be the same pointer diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 93f4cabe624..1c448c36570 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -119,141 +119,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #undef INCREMENT #define INCREMENT 64 -// Static variables. -static Identifier *_global_scope_name = 0; -static Identifier *_global_scope_root_name = 0; - -// Static functions. - -// Determines if a name is global. -static long -is_global_name (Identifier *i) -{ - long comp_result = 0; - - if (i == 0) - { - return comp_result; - } - - if (_global_scope_name == 0) - { - ACE_NEW_RETURN (_global_scope_name, - Identifier ("::"), - 0); - } - - if (_global_scope_root_name == 0) - { - ACE_NEW_RETURN (_global_scope_root_name, - Identifier (""), - 0); - } - - comp_result = i->compare (_global_scope_name); - - if (comp_result == 0) - { - comp_result = i->compare (_global_scope_root_name); - } - - return comp_result; -} - -// Helper function for lookup_by_name. Iterates doing local lookups of -// subsequent components of a scoped name. -static AST_Decl * -iter_lookup_by_name_local (AST_Decl *d, - UTL_ScopedName *e, - long index, - bool full_def_only = false) -{ - AST_Typedef *td = AST_Typedef::narrow_from_decl (d); - AST_Decl *result = 0; - - // Remove all the layers of typedefs. - while (d != 0 && d->node_type () == AST_Decl::NT_typedef) - { - if (td == 0) - { - return 0; - } - - d = td->base_type (); - } - - if (d == 0) - { - return 0; - } - - // Try to convert the AST_Decl to a UTL_Scope. - UTL_Scope *sc = DeclAsScope (d); - - if (sc == 0) - { - return 0; - } - - if (index < static_cast<long> (sc->nmembers ())) - { - // Look up the first component of the scoped name. - result = sc->lookup_by_name_local (e->head (), - index, - full_def_only); - } - else - { - return 0; - } - - UTL_ScopedName *sn = (UTL_ScopedName *) e->tail (); - - if (result == 0) - { - if (sn == 0) - { - result = UTL_Scope::match_param (e); - } - - return result; - } - else - { - if (sn == 0) - { - // We're done. - return result; - } - else - { - // Look up the next component of the scoped name. - result = iter_lookup_by_name_local (result, - sn, - 0, - full_def_only); - } - - if (result != 0) - { - // We're done. - return result; - } - else - { - // Maybe we're on the wrong branch of reopened - // and/or nested modules, so let's see if there's - // another branch. If 'index' gets as high as the - // number of members in the scope, the call above - // to lookup_by_name_local will catch it and return 0. - return iter_lookup_by_name_local (d, - e, - index + 1, - full_def_only); - } - } -} - // Constructors. UTL_Scope::UTL_Scope (void) @@ -301,10 +166,9 @@ UTL_Scope::~UTL_Scope (void) // Special version of lookup which only looks at the local name instead of // the fully scoped name, when doing lookups. This version is intended to -// be used only by the CFE add_xxx functions. +// be used only by the frontend add_xxx functions. AST_Decl * -UTL_Scope::lookup_for_add (AST_Decl *d, - bool) +UTL_Scope::lookup_for_add (AST_Decl *d) { if (d == 0) { @@ -318,8 +182,7 @@ UTL_Scope::lookup_for_add (AST_Decl *d, return 0; } - return this->lookup_by_name_local (id, - 0); + return this->lookup_by_name_local (id, 0); } int @@ -538,7 +401,7 @@ UTL_Scope::fe_add_decl (AST_Decl *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, false)) != 0) + if ((d = this->lookup_for_add (t)) != 0) { if (!can_be_redefined (d)) { @@ -624,7 +487,7 @@ UTL_Scope::fe_add_full_struct_type (AST_Structure *t) { AST_Decl *predef = 0; - if ((predef = this->lookup_for_add (t, false)) != 0) + if ((predef = this->lookup_for_add (t)) != 0) { if (!can_be_redefined (predef)) { @@ -674,12 +537,12 @@ UTL_Scope::fe_add_fwd_struct_type (AST_StructureFwd *t) AST_Decl *d = 0; // Already defined and cannot be redefined? Or already used? - if ((d = this->lookup_for_add (t, false)) != 0) + if ((d = this->lookup_for_add (t)) != 0) { AST_Decl::NodeType nt = d->node_type (); // There used to be another check here ANDed with the one below: - // d->defined_in () == this. But lookup_for_add calls only + // d->defined_in () == this. But lookup_for_add() calls only // lookup_by_name_local(), which does not bump up the scope, // and look_in_previous() for modules. If look_in_previous() // finds something, the scopes will NOT be the same pointer @@ -1422,7 +1285,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, } // If name starts with "::" or "" start lookup in global scope. - if (is_global_name (e->head ())) + if (this->is_global_name (e->head ())) { // Get parent scope. d = ScopeAsDecl (this); @@ -1646,10 +1509,10 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, if (sn != 0) { - d = iter_lookup_by_name_local (d, - sn, - 0, - full_def_only); + d = this->iter_lookup_by_name_local (d, + sn, + 0, + full_def_only); } // If the start of the scoped name is an interface, and the @@ -2394,6 +2257,117 @@ UTL_Scope::smart_local_add (AST_Decl *t) } } +/// Determines if a name is global. +bool +UTL_Scope::is_global_name (Identifier *i) +{ + if (i == 0) + { + return false; + } + + ACE_CString cmp (i->get_string (), 0, false); + + if (cmp == "" || cmp == "::") + { + return true; + } + + return false; +} + +AST_Decl * +UTL_Scope::iter_lookup_by_name_local (AST_Decl *d, + UTL_ScopedName *e, + long index, + bool full_def_only) +{ + AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + AST_Decl *result = 0; + + // Remove all the layers of typedefs. + while (d != 0 && d->node_type () == AST_Decl::NT_typedef) + { + if (td == 0) + { + return 0; + } + + d = td->base_type (); + } + + if (d == 0) + { + return 0; + } + + // Try to convert the AST_Decl to a UTL_Scope. + UTL_Scope *sc = DeclAsScope (d); + + if (sc == 0) + { + return 0; + } + + if (index < static_cast<long> (sc->nmembers ())) + { + // Look up the first component of the scoped name. + result = sc->lookup_by_name_local (e->head (), + index, + full_def_only); + } + else + { + return 0; + } + + UTL_ScopedName *sn = (UTL_ScopedName *) e->tail (); + + if (result == 0) + { + if (sn == 0) + { + result = UTL_Scope::match_param (e); + } + + return result; + } + else + { + if (sn == 0) + { + // We're done. + return result; + } + else + { + // Look up the next component of the scoped name. + result = iter_lookup_by_name_local (result, + sn, + 0, + full_def_only); + } + + if (result != 0) + { + // We're done. + return result; + } + else + { + // Maybe we're on the wrong branch of reopened + // and/or nested modules, so let's see if there's + // another branch. If 'index' gets as high as the + // number of members in the scope, the call above + // to lookup_by_name_local will catch it and return 0. + return this->iter_lookup_by_name_local (d, + e, + index + 1, + full_def_only); + } + } +} + IMPL_NARROW_FROM_SCOPE(UTL_Scope) // UTL_SCOPE_ACTIVE_ITERATOR |