diff options
Diffstat (limited to 'TAO/TAO_IDL/include')
37 files changed, 23 insertions, 157 deletions
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 |