diff options
48 files changed, 392 insertions, 199 deletions
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp index 2636c9918de..99b233c0d70 100644 --- a/TAO/TAO_IDL/ast/ast_argument.cpp +++ b/TAO/TAO_IDL/ast/ast_argument.cpp @@ -117,6 +117,10 @@ AST_Argument::AST_Argument(Direction d, AST_Type *ft, UTL_ScopedName *n, { } +AST_Argument::~AST_Argument (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index 152089f2af4..aa0d1db6f08 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -96,6 +96,10 @@ AST_Array::AST_Array(UTL_ScopedName *n, unsigned long nd, UTL_ExprList *ds) pd_dims = compute_dims(ds, nd); } +AST_Array::~AST_Array (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp index f2e14754d45..82188f91b16 100644 --- a/TAO/TAO_IDL/ast/ast_attribute.cpp +++ b/TAO/TAO_IDL/ast/ast_attribute.cpp @@ -97,6 +97,10 @@ AST_Attribute::AST_Attribute(idl_bool ro, { } +AST_Attribute::~AST_Attribute (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp index 886a33af0eb..2b2f9149042 100644 --- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp +++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp @@ -79,13 +79,17 @@ ACE_RCSID(ast, ast_concrete_type, "$Id$") /* * Constructor(s) and destructor */ -AST_ConcreteType::AST_ConcreteType() +AST_ConcreteType::AST_ConcreteType () { } -AST_ConcreteType::AST_ConcreteType(AST_Decl::NodeType nt, UTL_ScopedName *n, +AST_ConcreteType::AST_ConcreteType (AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(nt, n, p) + : AST_Decl (nt, n, p) +{ +} + +AST_ConcreteType::~AST_ConcreteType (void) { } diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index 2d0a45d5cd5..e7de155511a 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -170,6 +170,15 @@ AST_Constant::AST_Constant(AST_Expression::ExprType t, { } +AST_Constant::~AST_Constant (void) +{ + if (this->pd_constant_value) + { + delete this->pd_constant_value; + this->pd_constant_value = 0; + } +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp index d76d2e34a61..e74e79ab696 100644 --- a/TAO/TAO_IDL/ast/ast_enum.cpp +++ b/TAO/TAO_IDL/ast/ast_enum.cpp @@ -86,13 +86,18 @@ AST_Enum::AST_Enum() { } -AST_Enum::AST_Enum(UTL_ScopedName *n, UTL_StrList *p) +AST_Enum::AST_Enum (UTL_ScopedName *n, + UTL_StrList *p) : AST_Decl(AST_Decl::NT_enum, n, p), UTL_Scope(AST_Decl::NT_enum), pd_enum_counter(0) { } +AST_Enum::~AST_Enum (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp index 54397f8e52f..5b41e2cedf3 100644 --- a/TAO/TAO_IDL/ast/ast_enum_val.cpp +++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp @@ -92,6 +92,10 @@ AST_EnumVal::AST_EnumVal(unsigned long v, UTL_ScopedName *n, UTL_StrList *p) { } +AST_EnumVal::~AST_EnumVal (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp index 32986965006..a09f4a13b91 100644 --- a/TAO/TAO_IDL/ast/ast_exception.cpp +++ b/TAO/TAO_IDL/ast/ast_exception.cpp @@ -89,6 +89,10 @@ AST_Exception::AST_Exception(UTL_ScopedName *n, UTL_StrList *p) { } +AST_Exception::~AST_Exception (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 7bb7fea2863..b6023d57295 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -93,44 +93,46 @@ AST_Expression::fill_definition_details() /* * An AST_Expression denoting a symbolic name */ -AST_Expression::AST_Expression(UTL_ScopedName *nm) - : pd_ec(EC_symbol), - pd_ev(NULL), - pd_v1(NULL), - pd_v2(NULL), - pd_n(nm) +AST_Expression::AST_Expression (UTL_ScopedName *nm) + : pd_ec (EC_symbol), + pd_ev (NULL), + pd_v1 (NULL), + pd_v2 (NULL), + pd_n (nm) { - fill_definition_details(); + fill_definition_details (); } /* * An AST_Expression denoting a type coercion from another AST_Expression */ -AST_Expression::AST_Expression(AST_Expression *v, ExprType t) - : pd_ec(EC_none), - pd_ev(NULL), - pd_v1(NULL), - pd_v2(NULL), - pd_n(NULL) +AST_Expression::AST_Expression (AST_Expression *v, + ExprType t) + : pd_ec (EC_none), + pd_ev (NULL), + pd_v1 (NULL), + pd_v2 (NULL), + pd_n (NULL) { - fill_definition_details(); + fill_definition_details (); - pd_ev = v->coerce(t); + pd_ev = v->coerce (t); if (pd_ev == NULL) - idl_global->err()->coercion_error(v, t); + idl_global->err ()->coercion_error (v, t); } /* * An AST_Expression denoting a binary expression combination from * two other AST_Expressions */ -AST_Expression::AST_Expression(ExprComb c, AST_Expression *ev1, +AST_Expression::AST_Expression (ExprComb c, + AST_Expression *ev1, AST_Expression *ev2) - : pd_ec(c), - pd_ev(NULL), - pd_v1(ev1), - pd_v2(ev2), - pd_n(NULL) + : pd_ec (c), + pd_ev (NULL), + pd_v1 (ev1), + pd_v2 (ev2), + pd_n (NULL) { fill_definition_details(); } @@ -339,6 +341,10 @@ AST_Expression::AST_Expression(char *sv) pd_ev->u.wstrval = sv; } +AST_Expression::~AST_Expression (void) +{ +} + /* * Static operations */ diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index c29e1124f51..cf3044c811c 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -123,6 +123,10 @@ AST_Field::AST_Field (AST_Decl::NodeType nt, { } +AST_Field::~AST_Field (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp index 408694416f9..ef215bbc4e2 100644 --- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp +++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp @@ -81,15 +81,15 @@ ACE_RCSID(ast, ast_interface_fwd, "$Id$") /* * Constructor(s) and destructor */ -AST_InterfaceFwd::AST_InterfaceFwd() - : pd_full_definition(NULL) +AST_InterfaceFwd::AST_InterfaceFwd () + : pd_full_definition (NULL) { } AST_InterfaceFwd::AST_InterfaceFwd( AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(AST_Decl::NT_interface_fwd, n, p) + : AST_Decl (AST_Decl::NT_interface_fwd, n, p) { /* * Create a dummy placeholder for the forward declared interface. This @@ -109,6 +109,10 @@ AST_InterfaceFwd::AST_InterfaceFwd( AST_Interface *dummy, // AST_record_fwd_interface(this); } +AST_InterfaceFwd::~AST_InterfaceFwd (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index e9301965380..c815dadb6f8 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -80,14 +80,15 @@ ACE_RCSID(ast, ast_module, "$Id$") /* * Constructor(s) and destructor */ -AST_Module::AST_Module() +AST_Module::AST_Module () { } -AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(AST_Decl::NT_module, n, p), - UTL_Scope(AST_Decl::NT_module), - pd_has_nested_valuetype (0) +AST_Module::AST_Module (UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl (AST_Decl::NT_module, n, p), + UTL_Scope(AST_Decl::NT_module), + pd_has_nested_valuetype (0) { static int CORBA_module_added = 0; @@ -140,6 +141,10 @@ AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p) } } +AST_Module::~AST_Module (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp index d4ab8ef1075..f26ee641b0b 100644 --- a/TAO/TAO_IDL/ast/ast_native.cpp +++ b/TAO/TAO_IDL/ast/ast_native.cpp @@ -21,6 +21,10 @@ AST_Native::AST_Native(UTL_ScopedName *n, { } +AST_Native::~AST_Native (void) +{ +} + /* * Dump this AST_Native node to the ostream o */ diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp index 05d6701cc12..f8c667465ea 100644 --- a/TAO/TAO_IDL/ast/ast_operation.cpp +++ b/TAO/TAO_IDL/ast/ast_operation.cpp @@ -86,7 +86,7 @@ ACE_RCSID(ast, ast_operation, "$Id$") /* * Constructor(s) and destructor */ -AST_Operation::AST_Operation() +AST_Operation::AST_Operation () : pd_return_type(NULL), pd_flags(OP_noflags), pd_context(NULL), @@ -94,8 +94,10 @@ AST_Operation::AST_Operation() { } -AST_Operation::AST_Operation(AST_Type *rt, Flags fl, UTL_ScopedName *n, - UTL_StrList *p) +AST_Operation::AST_Operation (AST_Type *rt, + Flags fl, + UTL_ScopedName *n, + UTL_StrList *p) : AST_Decl(AST_Decl::NT_op, n, p), UTL_Scope(AST_Decl::NT_op), pd_return_type(rt), @@ -119,6 +121,10 @@ AST_Operation::AST_Operation(AST_Type *rt, Flags fl, UTL_ScopedName *n, } } +AST_Operation::~AST_Operation (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp index 52ad257ec10..4de85b318fd 100644 --- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp +++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp @@ -83,15 +83,20 @@ ACE_RCSID(ast, ast_predefined_type, "$Id$") /* * Constructor(s) */ -AST_PredefinedType::AST_PredefinedType() - : pd_pt(PT_long) +AST_PredefinedType::AST_PredefinedType () + : pd_pt(PT_long) { } -AST_PredefinedType::AST_PredefinedType(PredefinedType t, UTL_ScopedName *n, - UTL_StrList *p) - : AST_Decl(AST_Decl::NT_pre_defined, n, p), - pd_pt(t) +AST_PredefinedType::AST_PredefinedType (PredefinedType t, + UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl(AST_Decl::NT_pre_defined, n, p), + pd_pt(t) +{ +} + +AST_PredefinedType::~AST_PredefinedType (void) { } diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp index f97f30a028c..e0da98e0aae 100644 --- a/TAO/TAO_IDL/ast/ast_root.cpp +++ b/TAO/TAO_IDL/ast/ast_root.cpp @@ -81,16 +81,21 @@ ACE_RCSID(ast, ast_root, "$Id$") /* * Constructor(s) and destructor */ -AST_Root::AST_Root() +AST_Root::AST_Root () { } -AST_Root::AST_Root(UTL_ScopedName *n, UTL_StrList *p) +AST_Root::AST_Root (UTL_ScopedName *n, + UTL_StrList *p) : AST_Decl(AST_Decl::NT_module, n, p), UTL_Scope(AST_Decl::NT_module) { } +AST_Root::~AST_Root (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp index ca23b86dc49..449f1380663 100644 --- a/TAO/TAO_IDL/ast/ast_sequence.cpp +++ b/TAO/TAO_IDL/ast/ast_sequence.cpp @@ -82,20 +82,26 @@ ACE_RCSID(ast, ast_sequence, "$Id$") /* * Constructor(s) and destructor */ -AST_Sequence::AST_Sequence() - : pd_max_size(0), - pd_base_type(NULL) +AST_Sequence::AST_Sequence () + : pd_max_size(0), + pd_base_type(NULL) { } -AST_Sequence::AST_Sequence(AST_Expression *ms, AST_Type *bt) - : AST_Decl(AST_Decl::NT_sequence, - new UTL_ScopedName( - new Identifier("sequence",1,0,I_FALSE), - NULL), - NULL), - pd_max_size(ms), - pd_base_type(bt) +AST_Sequence::AST_Sequence (AST_Expression *ms, + AST_Type *bt) + : AST_Decl(AST_Decl::NT_sequence, + new UTL_ScopedName ( + new Identifier ("sequence", 1, 0, I_FALSE), + NULL + ), + NULL), + pd_max_size(ms), + pd_base_type(bt) +{ +} + +AST_Sequence::~AST_Sequence (void) { } diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp index aebbd4648c3..9fa15613b71 100644 --- a/TAO/TAO_IDL/ast/ast_string.cpp +++ b/TAO/TAO_IDL/ast/ast_string.cpp @@ -81,39 +81,44 @@ ACE_RCSID(ast, ast_string, "$Id$") /* * Constructor(s) and destructor */ -AST_String::AST_String() - : pd_max_size(0), pd_width(1) +AST_String::AST_String () + : pd_max_size (0), + pd_width (1) { } -AST_String::AST_String(AST_Expression *ms) - : AST_Decl(AST_Decl::NT_string, - new UTL_ScopedName(new Identifier("string",1,0,I_FALSE), - NULL), - NULL), - pd_max_size(ms), - pd_width(sizeof(char)) +AST_String::AST_String (AST_Expression *ms) + : AST_Decl (AST_Decl::NT_string, + new UTL_ScopedName (new Identifier ("string", 1, 0, I_FALSE), + NULL), + NULL), + pd_max_size (ms), + pd_width (sizeof (char)) { } -AST_String::AST_String(AST_Expression *ms, - long wide) - : AST_Decl (wide == sizeof (char) - ? AST_Decl::NT_string - : AST_Decl::NT_wstring, - new UTL_ScopedName (wide == sizeof (char) - ? new Identifier ("string", - 1, - 0, - I_FALSE) - : new Identifier ("wstring", - 1, - 0, - I_FALSE), - NULL), - NULL), - pd_max_size(ms), - pd_width(wide) +AST_String::AST_String (AST_Expression *ms, + long wide) + : AST_Decl (wide == sizeof (char) + ? AST_Decl::NT_string + : AST_Decl::NT_wstring, + new UTL_ScopedName (wide == sizeof (char) + ? new Identifier ("string", + 1, + 0, + I_FALSE) + : new Identifier ("wstring", + 1, + 0, + I_FALSE), + NULL), + NULL), + pd_max_size(ms), + pd_width(wide) +{ +} + +AST_String::~AST_String (void) { } diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp index 1b08b4f7333..dd83fd759a4 100644 --- a/TAO/TAO_IDL/ast/ast_structure.cpp +++ b/TAO/TAO_IDL/ast/ast_structure.cpp @@ -84,17 +84,22 @@ AST_Structure::AST_Structure() { } -AST_Structure::AST_Structure(UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(AST_Decl::NT_struct, n, p), - UTL_Scope(AST_Decl::NT_struct) +AST_Structure::AST_Structure (UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl (AST_Decl::NT_struct, n, p), + UTL_Scope (AST_Decl::NT_struct) { } -AST_Structure::AST_Structure(AST_Decl::NodeType nt, - UTL_ScopedName *n, - UTL_StrList *p) - : AST_Decl(nt, n, p), - UTL_Scope(nt) +AST_Structure::AST_Structure (AST_Decl::NodeType nt, + UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl(nt, n, p), + UTL_Scope(nt) +{ +} + +AST_Structure::~AST_Structure (void) { } diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index b692b0b4c25..15393e786db 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -79,12 +79,18 @@ ACE_RCSID(ast, ast_type, "$Id$") /* * Constructor(s) and destructor */ -AST_Type::AST_Type() +AST_Type::AST_Type () { } -AST_Type::AST_Type(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(nt, n, p) +AST_Type::AST_Type (AST_Decl::NodeType nt, + UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl (nt, n, p) +{ +} + +AST_Type::~AST_Type (void) { } diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp index 0db573bfa2d..a58b29525c4 100644 --- a/TAO/TAO_IDL/ast/ast_typedef.cpp +++ b/TAO/TAO_IDL/ast/ast_typedef.cpp @@ -82,14 +82,20 @@ ACE_RCSID(ast, ast_typedef, "$Id$") /* * Constructor(s) and destructor */ -AST_Typedef::AST_Typedef() - : pd_base_type(NULL) +AST_Typedef::AST_Typedef () + : pd_base_type(NULL) { } -AST_Typedef::AST_Typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(AST_Decl::NT_typedef, n, p), - pd_base_type(bt) +AST_Typedef::AST_Typedef (AST_Type *bt, + UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl (AST_Decl::NT_typedef, n, p), + pd_base_type(bt) +{ +} + +AST_Typedef::~AST_Typedef (void) { } diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index 23e8eb59a9f..7f75ef3bf5b 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -85,13 +85,15 @@ ACE_RCSID(ast, ast_union, "$Id$") /* * Constructor(s) and destructor */ -AST_Union::AST_Union() +AST_Union::AST_Union () { } -AST_Union::AST_Union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p) - : AST_Decl(AST_Decl::NT_union, n, p), - UTL_Scope(AST_Decl::NT_union) +AST_Union::AST_Union (AST_ConcreteType *dt, + UTL_ScopedName *n, + UTL_StrList *p) + : AST_Decl (AST_Decl::NT_union, n, p), + UTL_Scope(AST_Decl::NT_union) { AST_PredefinedType *pdt; @@ -155,6 +157,10 @@ AST_Union::AST_Union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p) idl_global->err()->error2(UTL_Error::EIDL_DISC_TYPE, this, dt); } +AST_Union::~AST_Union (void) +{ +} + /* * Private operations */ diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp index d8dbfa29552..c3114fabe89 100644 --- a/TAO/TAO_IDL/ast/ast_union_branch.cpp +++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp @@ -81,16 +81,22 @@ ACE_RCSID(ast, ast_union_branch, "$Id$") /* * Constructor(s) and destructor */ -AST_UnionBranch::AST_UnionBranch() - : pd_ll (NULL) +AST_UnionBranch::AST_UnionBranch () + : pd_ll (NULL) { } -AST_UnionBranch::AST_UnionBranch (UTL_LabelList *ll, AST_Type *ft, - UTL_ScopedName *n, UTL_StrList *p) - : AST_Field(AST_Decl::NT_union_branch, ft, n, p), - AST_Decl(AST_Decl::NT_union_branch, n, p), - pd_ll (ll) +AST_UnionBranch::AST_UnionBranch (UTL_LabelList *ll, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p) +: AST_Field (AST_Decl::NT_union_branch, ft, n, p), + AST_Decl (AST_Decl::NT_union_branch, n, p), + pd_ll (ll) +{ +} + +AST_UnionBranch::~AST_UnionBranch (void) { } diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp index 6fc9928982f..2bd1fdc6b12 100644 --- a/TAO/TAO_IDL/ast/ast_union_label.cpp +++ b/TAO/TAO_IDL/ast/ast_union_label.cpp @@ -82,18 +82,23 @@ ACE_RCSID(ast, ast_union_label, "$Id$") /* * Constructor(s) */ -AST_UnionLabel::AST_UnionLabel() - : pd_label_kind(UL_default), - pd_label_val(NULL) +AST_UnionLabel::AST_UnionLabel () + : pd_label_kind (UL_default), + pd_label_val (NULL) { } -AST_UnionLabel::AST_UnionLabel(UnionLabel lk, AST_Expression *lv) - : pd_label_kind(lk), - pd_label_val(lv) +AST_UnionLabel::AST_UnionLabel (UnionLabel lk, + AST_Expression *lv) + : pd_label_kind (lk), + pd_label_val (lv) { if (lv != NULL) - lv->evaluate(AST_Expression::EK_const); + lv->evaluate (AST_Expression::EK_const); +} + +AST_UnionLabel::~AST_UnionLabel (void) +{ } /* diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index e2d2663362d..d156ad7a86c 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -92,10 +92,13 @@ public: // Operations // Constructor(s) - AST_Argument(); - AST_Argument(Direction direction, AST_Type *ft, UTL_ScopedName *n, - UTL_StrList *p); - virtual ~AST_Argument() {} + AST_Argument (); + AST_Argument (Direction direction, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Argument (void); // Data Accessors Direction direction(); diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index a8f0b7a5002..18754248901 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -83,9 +83,12 @@ public: // Operations // Constructor(s) - AST_Array(); - AST_Array(UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims); - virtual ~AST_Array() {} + AST_Array (); + AST_Array (UTL_ScopedName *n, + unsigned long ndims, + UTL_ExprList *dims); + + virtual ~AST_Array (void); // Data Accessors unsigned long n_dims(); diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index f9f5dd3f7cf..2e13fd08aff 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -84,12 +84,13 @@ public: // Operations // Constructor(s) - AST_Attribute(); - AST_Attribute(idl_bool readonly, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); - virtual ~AST_Attribute() {} + AST_Attribute (); + AST_Attribute (idl_bool readonly, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Attribute (void); // Data Accessors idl_bool readonly(); diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 660994ee572..680608fed51 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -83,9 +83,12 @@ public: // Operations // Constructor(s) - AST_ConcreteType(); - AST_ConcreteType(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_ConcreteType() {} + AST_ConcreteType (); + AST_ConcreteType (AST_Decl::NodeType nt, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_ConcreteType (void); // Narrowing DEF_NARROW_METHODS1(AST_ConcreteType, AST_Type); diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index afb73edeb58..3dbb54977b5 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -95,7 +95,7 @@ public: AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p); AST_Constant(AST_Expression::ExprType et, AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Constant() {} + virtual ~AST_Constant (void); // Data Accessors AST_Expression *constant_value(); diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index 550146537b7..23801b3dfe6 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -82,9 +82,11 @@ public: // Operations // Constructor(s) - AST_Enum(); - AST_Enum(UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Enum() {} + AST_Enum (); + AST_Enum (UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Enum (void); // Narrowing DEF_NARROW_METHODS2(AST_Enum, AST_ConcreteType, UTL_Scope); diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h index 83b5033fcf6..02e187ebd75 100644 --- a/TAO/TAO_IDL/include/ast_enum_val.h +++ b/TAO/TAO_IDL/include/ast_enum_val.h @@ -84,9 +84,12 @@ public: // Operations // Constructor(s) - AST_EnumVal(); - AST_EnumVal(unsigned long v, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_EnumVal() {} + AST_EnumVal (); + AST_EnumVal (unsigned long v, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_EnumVal (void); // Narrowing DEF_NARROW_METHODS1(AST_EnumVal, AST_Constant); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index e7821e6d405..2ed9ca7c7ed 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -91,9 +91,11 @@ public: // Operations // Constructor(s) - AST_Exception(); - AST_Exception(UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Exception() {} + AST_Exception (); + AST_Exception (UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Exception (void); // Narrowing DEF_NARROW_METHODS1(AST_Exception, AST_Structure); diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index f8fc03bcdeb..8acd7dc7c46 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -182,7 +182,8 @@ public: AST_Expression(UTL_String *s); AST_Expression(char *s); AST_Expression(UTL_ScopedName *n); - virtual ~AST_Expression () {} + + virtual ~AST_Expression (void); // Data Accessors UTL_Scope *defined_in(); diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index a6583ee3ec0..45bbd97a495 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -94,12 +94,20 @@ public: // Operations // Constructor(s) - AST_Field(); - AST_Field(AST_Type *field_type, - UTL_ScopedName *n, UTL_StrList *p, Visibility vis = vis_NA); - AST_Field(AST_Decl::NodeType nt, AST_Type *field_type, - UTL_ScopedName *n, UTL_StrList *p, Visibility vis = vis_NA); - virtual ~AST_Field() {} + AST_Field (); + + AST_Field (AST_Type *field_type, + UTL_ScopedName *n, + UTL_StrList *p, + Visibility vis = vis_NA); + + AST_Field (AST_Decl::NodeType nt, + AST_Type *field_type, + UTL_ScopedName *n, + UTL_StrList *p, + Visibility vis = vis_NA); + + virtual ~AST_Field (void); // Data Accessors AST_Type *field_type(); diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index 64a334f4223..fb78aefbd6e 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -82,9 +82,12 @@ public: // Operations // Constructor(s) - AST_InterfaceFwd(); - AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_InterfaceFwd() {} + AST_InterfaceFwd (); + AST_InterfaceFwd (AST_Interface *dummy, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_InterfaceFwd (void); // Data Accessors AST_Interface *full_definition(); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 1f2d6a37411..47df2d0ef64 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -85,9 +85,12 @@ public: // Operations // Constructor(s) - AST_Module(); - AST_Module(UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Module() {} + AST_Module (); + + AST_Module (UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Module (void); // Narrowing DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope); diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 4b3f40fa6b9..04fb8313b36 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -21,10 +21,11 @@ public: AST_Native (void); // default constructor - AST_Native(UTL_ScopedName *n, UTL_StrList *p); + AST_Native (UTL_ScopedName *n, + UTL_StrList *p); // constructor that initializes its scoped name - virtual ~AST_Native (void) {} + virtual ~AST_Native (void); // destructor // Narrowing diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index 823fe4ac2b7..6fe7f305b48 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -97,12 +97,13 @@ public: // Operations // Constructor(s) - AST_Operation(); - AST_Operation(AST_Type *return_type, - Flags flags, - UTL_ScopedName *n, - UTL_StrList *p); - virtual ~AST_Operation() {} + AST_Operation (); + AST_Operation (AST_Type *return_type, + Flags flags, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Operation (void); // Data Accessors AST_Type *return_type(); diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 17a85d5e47e..4a01b911db2 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -105,9 +105,13 @@ public: // Operations // Constructor(s) - AST_PredefinedType(); - AST_PredefinedType(PredefinedType t, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_PredefinedType() {} + AST_PredefinedType (); + + AST_PredefinedType (PredefinedType t, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_PredefinedType (void); // Data Accessors PredefinedType pt(); diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h index f85e5f9cbb3..cbff936f220 100644 --- a/TAO/TAO_IDL/include/ast_root.h +++ b/TAO/TAO_IDL/include/ast_root.h @@ -81,9 +81,12 @@ public: // Operations // Constructor(s) - AST_Root(); - AST_Root(UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Root() {} + AST_Root (); + + AST_Root (UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Root (void); // Narrowing DEF_NARROW_METHODS1(AST_Root, AST_Module); diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index 38c869792af..103e907bd53 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -84,9 +84,12 @@ public: // Operations // Constructor(s) - AST_Sequence(); - AST_Sequence(AST_Expression *max_size, AST_Type *bt); - virtual ~AST_Sequence() {} + AST_Sequence (); + + AST_Sequence (AST_Expression *max_size, + AST_Type *bt); + + virtual ~AST_Sequence (void); // Data Accessors AST_Expression *max_size(); diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h index b44577b975d..5956f116d7d 100644 --- a/TAO/TAO_IDL/include/ast_string.h +++ b/TAO/TAO_IDL/include/ast_string.h @@ -83,10 +83,14 @@ public: // Operations // Constructor(s) - AST_String(); - AST_String(AST_Expression *max_size); - AST_String(AST_Expression *max_size, long wide); - virtual ~AST_String() {} + AST_String (); + + AST_String (AST_Expression *max_size); + + AST_String (AST_Expression *max_size, + long wide); + + virtual ~AST_String (void); // Data Accessors AST_Expression *max_size(); diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index b0f14cc45fe..a89470f99f9 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -91,10 +91,16 @@ public: // Operations // Constructor(s) - AST_Structure(); - AST_Structure(UTL_ScopedName *n, UTL_StrList *p); - AST_Structure(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Structure() {} + AST_Structure (); + + AST_Structure (UTL_ScopedName *n, + UTL_StrList *p); + + AST_Structure (AST_Decl::NodeType nt, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Structure (void); // Narrowing DEF_NARROW_METHODS2(AST_Structure, AST_ConcreteType, UTL_Scope); diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 1b22dc98da5..78822b60bb9 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -89,9 +89,13 @@ public: // Operations // Constructor(s) - AST_Type(); - AST_Type(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Type() {} + AST_Type (); + + AST_Type (AST_Decl::NodeType nt, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Type (void); // Narrowing DEF_NARROW_METHODS1(AST_Type, AST_Decl); diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h index 623c023b84a..10914ea7748 100644 --- a/TAO/TAO_IDL/include/ast_typedef.h +++ b/TAO/TAO_IDL/include/ast_typedef.h @@ -83,9 +83,13 @@ public: // Operations // Constructor(s) - AST_Typedef(); - AST_Typedef(AST_Type *base_type, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Typedef() {} + AST_Typedef (); + + AST_Typedef (AST_Type *base_type, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Typedef (void); // Data Accessors AST_Type *base_type(); diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index 84f73d481d5..8fe7736e593 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -90,9 +90,13 @@ public: // Operations // Constructor(s) - AST_Union(); - AST_Union(AST_ConcreteType *disc_type, UTL_ScopedName *n, UTL_StrList *p); - virtual ~AST_Union() {} + AST_Union (); + + AST_Union (AST_ConcreteType *disc_type, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_Union (void); // Data Accessors AST_ConcreteType *disc_type(); diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index 23fc82edc00..ab97520339e 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -84,12 +84,14 @@ public: // Operations // Constructor(s) - AST_UnionBranch(); - AST_UnionBranch(UTL_LabelList *ll, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); - virtual ~AST_UnionBranch() {} + AST_UnionBranch (); + + AST_UnionBranch (UTL_LabelList *ll, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual ~AST_UnionBranch (void); // Data Accessors AST_UnionLabel *label (unsigned long index = 0); diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index 2a50603fcbf..46efc0f9402 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -89,9 +89,12 @@ public: // Operations // Constructor(s) - AST_UnionLabel(); - AST_UnionLabel(UnionLabel lk, AST_Expression *lv); - virtual ~AST_UnionLabel() {} + AST_UnionLabel (); + + AST_UnionLabel (UnionLabel lk, + AST_Expression *lv); + + virtual ~AST_UnionLabel (void); // Data Accessors UnionLabel label_kind(); |