diff options
Diffstat (limited to 'TAO/TAO_IDL')
281 files changed, 1853 insertions, 1809 deletions
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h index b2922adee95..972dafa2e0d 100644 --- a/TAO/TAO_IDL/be_include/be.h +++ b/TAO/TAO_IDL/be_include/be.h @@ -77,6 +77,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // ACE includes #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/OS.h" #include "ace/Singleton.h" #include "ace/Synch.h" @@ -90,29 +95,29 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_decl.h" // class BE_Decl #include "be_scope.h" // class BE_Scope -#include "be_generator.h" // BE generator class +#include "be_generator.h" // BE generator class #include "be_type.h" -#include "be_predefined_type.h" // class BE_PredefinedType -#include "be_module.h" // class BE_Module -#include "be_interface.h" // class BE_Interface -#include "be_interface_fwd.h" // class BE_InterfaceFwd -#include "be_structure.h" // class BE_Structure -#include "be_exception.h" // class BE_Exception +#include "be_predefined_type.h" // class BE_PredefinedType +#include "be_module.h" // class BE_Module +#include "be_interface.h" // class BE_Interface +#include "be_interface_fwd.h" // class BE_InterfaceFwd +#include "be_structure.h" // class BE_Structure +#include "be_exception.h" // class BE_Exception #include "be_expression.h" // class BE_Expr_val -#include "be_enum.h" // class BE_Enum -#include "be_operation.h" // class BE_Operation -#include "be_field.h" // class BE_Field -#include "be_argument.h" // class BE_Argument -#include "be_attribute.h" // class BE_Attribute -#include "be_union.h" // class BE_Union -#include "be_union_branch.h" // class BE_UnionBranch -#include "be_union_label.h" // class BE_UnionLabel -#include "be_constant.h" // class BE_Constant -#include "be_enum_val.h" // class BE_EnumVal -#include "be_array.h" // class BE_Array -#include "be_sequence.h" // class BE_Sequence -#include "be_string.h" // class BE_String -#include "be_typedef.h" // class BE_Typedef +#include "be_enum.h" // class BE_Enum +#include "be_operation.h" // class BE_Operation +#include "be_field.h" // class BE_Field +#include "be_argument.h" // class BE_Argument +#include "be_attribute.h" // class BE_Attribute +#include "be_union.h" // class BE_Union +#include "be_union_branch.h" // class BE_UnionBranch +#include "be_union_label.h" // class BE_UnionLabel +#include "be_constant.h" // class BE_Constant +#include "be_enum_val.h" // class BE_EnumVal +#include "be_array.h" // class BE_Array +#include "be_sequence.h" // class BE_Sequence +#include "be_string.h" // class BE_String +#include "be_typedef.h" // class BE_Typedef #include "be_root.h" // class BE_Root #include "be_native.h" // class BE_Native @@ -120,7 +125,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_codegen.h" // code generator #include "be_stream_factory.h" // output stream factory -#include "be_visitor.h" // abstract visitor +#include "be_visitor.h" // abstract visitor #include "be_visitor_factory.h" // visitor factory #include "be_visitor_context.h" // visitor context diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h index cbf2e30f249..f22f4fe1b72 100644 --- a/TAO/TAO_IDL/be_include/be_argument.h +++ b/TAO/TAO_IDL/be_include/be_argument.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_ARGUMENT_H) +#ifndef BE_ARGUMENT_H #define BE_ARGUMENT_H /* diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index b2e9dec8d73..a6862d1c227 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_ARRAY_H) +#ifndef BE_ARRAY_H #define BE_ARRAY_H class TAO_OutStream; diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h index 93f7d111279..fd228720030 100644 --- a/TAO/TAO_IDL/be_include/be_attribute.h +++ b/TAO/TAO_IDL/be_include/be_attribute.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_ATTRIBUTE_H) +#ifndef BE_ATTRIBUTE_H #define BE_ATTRIBUTE_H /* diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index 0b8d75d60eb..d220a89a749 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -16,7 +16,7 @@ // // ============================================================================ -#if !defined (TAO_BE_CODEGEN_H) +#ifndef TAO_BE_CODEGEN_H #define TAO_BE_CODEGEN_H #define NAMEBUFSIZE 1024 @@ -313,7 +313,7 @@ public: TAO_CDR_INPUT, TAO_CDR_OUTPUT, TAO_CDR_SCOPE, - + TAO_SUB_STATE_UNKNOWN }; diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h index 75a503e3e19..0ac2e25c0b4 100644 --- a/TAO/TAO_IDL/be_include/be_constant.h +++ b/TAO/TAO_IDL/be_include/be_constant.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (BE_CONSTANT_H) +#ifndef BE_CONSTANT_H #define BE_CONSTANT_H /* diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h index dd534af3940..181fbe6ad16 100644 --- a/TAO/TAO_IDL/be_include/be_decl.h +++ b/TAO/TAO_IDL/be_include/be_decl.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_DECL_H) +#ifndef TAO_BE_DECL_H #define TAO_BE_DECL_H class be_scope; diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 345f99620c1..354d155e25e 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (BE_ENUM_H) +#ifndef BE_ENUM_H #define BE_ENUM_H /* diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h index 45815eef998..e04b9e139c9 100644 --- a/TAO/TAO_IDL/be_include/be_enum_val.h +++ b/TAO/TAO_IDL/be_include/be_enum_val.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (BE_ENUM_VAL_H) +#ifndef BE_ENUM_VAL_H #define BE_ENUM_VAL_H /* diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h index 118272d4065..bd24a6bbaa5 100644 --- a/TAO/TAO_IDL/be_include/be_exception.h +++ b/TAO/TAO_IDL/be_include/be_exception.h @@ -1,6 +1,6 @@ // $Id$ -#if !defined (BE_EXCEPTION_H) +#ifndef BE_EXCEPTION_H #define BE_EXCEPTION_H /* diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h index 01829d9b3bf..c3fcf04b5b9 100644 --- a/TAO/TAO_IDL/be_include/be_expression.h +++ b/TAO/TAO_IDL/be_include/be_expression.h @@ -4,7 +4,7 @@ // // = LIBRARY // TAO IDL -// +// // = FILENAME // be_expression.h // @@ -14,18 +14,18 @@ // // = AUTHOR // Copyright 1994-1995 by Sun Microsystems, Inc. -// and +// and // Aniruddha Gokhale -// +// // ============================================================================ -#if !defined (BE_EXPRESSION_H) +#ifndef BE_EXPRESSION_H #define BE_EXPRESSION_H /* * BE_Expression */ -class be_expression : public virtual AST_Expression +class be_expression : public virtual AST_Expression { public: // Operations diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h index b5802574bad..526cab7c19b 100644 --- a/TAO/TAO_IDL/be_include/be_field.h +++ b/TAO/TAO_IDL/be_include/be_field.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_FIELD_H) +#ifndef BE_FIELD_H #define BE_FIELD_H /* diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index a4d6d22f636..d28bf650f1d 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -80,85 +80,85 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from be.h */ -class be_generator : public AST_Generator { +class be_generator : public AST_Generator { public: - virtual AST_Root *create_root(UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Root *create_root(UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a module which is the root of an AST made up of // BE nodes // Operations virtual AST_PredefinedType *create_predefined_type(AST_PredefinedType::PredefinedType t, - UTL_ScopedName *n, - UTL_StrList *p); - - virtual AST_Module *create_module(UTL_ScopedName *n, UTL_StrList *p); - virtual AST_Interface *create_interface(UTL_ScopedName *n, - AST_Interface **ih, - long nih, - UTL_StrList *p); + UTL_ScopedName *n, + UTL_StrList *p); + + virtual AST_Module *create_module(UTL_ScopedName *n, UTL_StrList *p); + virtual AST_Interface *create_interface(UTL_ScopedName *n, + AST_Interface **ih, + long nih, + UTL_StrList *p); virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n, - UTL_StrList *p); - virtual AST_Exception *create_exception(UTL_ScopedName *n, UTL_StrList *p); - virtual AST_Structure *create_structure(UTL_ScopedName *n, UTL_StrList *p); - virtual AST_Enum *create_enum(UTL_ScopedName *n, UTL_StrList *p); - virtual AST_Operation *create_operation(AST_Type *rt, - AST_Operation::Flags fl, - UTL_ScopedName *n, - UTL_StrList *p); - virtual AST_Field *create_field(AST_Type *ft, UTL_ScopedName *n, - UTL_StrList *p); - virtual AST_Argument *create_argument(AST_Argument::Direction d, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); - virtual AST_Attribute *create_attribute(idl_bool ro, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); - virtual AST_Union *create_union(AST_ConcreteType *dt, - UTL_ScopedName *n, - UTL_StrList *p); + UTL_StrList *p); + virtual AST_Exception *create_exception(UTL_ScopedName *n, UTL_StrList *p); + virtual AST_Structure *create_structure(UTL_ScopedName *n, UTL_StrList *p); + virtual AST_Enum *create_enum(UTL_ScopedName *n, UTL_StrList *p); + virtual AST_Operation *create_operation(AST_Type *rt, + AST_Operation::Flags fl, + UTL_ScopedName *n, + UTL_StrList *p); + virtual AST_Field *create_field(AST_Type *ft, UTL_ScopedName *n, + UTL_StrList *p); + virtual AST_Argument *create_argument(AST_Argument::Direction d, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); + virtual AST_Attribute *create_attribute(idl_bool ro, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); + virtual AST_Union *create_union(AST_ConcreteType *dt, + UTL_ScopedName *n, + UTL_StrList *p); virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul, - AST_Expression *lv); - virtual AST_Constant *create_constant(AST_Expression::ExprType et, - AST_Expression *ev, - UTL_ScopedName *n, - UTL_StrList *p); - - virtual AST_Expression *create_expr(UTL_ScopedName *n); - virtual AST_Expression *create_expr(AST_Expression *v, - AST_Expression::ExprType t); - virtual AST_Expression *create_expr(AST_Expression::ExprComb c, - AST_Expression *v1, - AST_Expression *v2); - virtual AST_Expression *create_expr(long v); - virtual AST_Expression *create_expr(long v, - AST_Expression::ExprType t); - virtual AST_Expression *create_expr(unsigned long v); - virtual AST_Expression *create_expr(String *s); - virtual AST_Expression *create_expr(char c); - virtual AST_Expression *create_expr(double d); - - virtual AST_EnumVal *create_enum_val(unsigned long v, - UTL_ScopedName *n, - UTL_StrList *p); - virtual AST_Array *create_array(UTL_ScopedName *n, - unsigned long ndims, - UTL_ExprList *dims); - virtual AST_Sequence *create_sequence(AST_Expression *v, AST_Type *bt); - virtual AST_String *create_string(AST_Expression *v); - virtual AST_String *create_wstring(AST_Expression *v); - virtual AST_Typedef *create_typedef(AST_Type *bt, - UTL_ScopedName *n, - UTL_StrList *p); + AST_Expression *lv); + virtual AST_Constant *create_constant(AST_Expression::ExprType et, + AST_Expression *ev, + UTL_ScopedName *n, + UTL_StrList *p); + + virtual AST_Expression *create_expr(UTL_ScopedName *n); + virtual AST_Expression *create_expr(AST_Expression *v, + AST_Expression::ExprType t); + virtual AST_Expression *create_expr(AST_Expression::ExprComb c, + AST_Expression *v1, + AST_Expression *v2); + virtual AST_Expression *create_expr(long v); + virtual AST_Expression *create_expr(long v, + AST_Expression::ExprType t); + virtual AST_Expression *create_expr(unsigned long v); + virtual AST_Expression *create_expr(String *s); + virtual AST_Expression *create_expr(char c); + virtual AST_Expression *create_expr(double d); + + virtual AST_EnumVal *create_enum_val(unsigned long v, + UTL_ScopedName *n, + UTL_StrList *p); + virtual AST_Array *create_array(UTL_ScopedName *n, + unsigned long ndims, + UTL_ExprList *dims); + virtual AST_Sequence *create_sequence(AST_Expression *v, AST_Type *bt); + virtual AST_String *create_string(AST_Expression *v); + virtual AST_String *create_wstring(AST_Expression *v); + virtual AST_Typedef *create_typedef(AST_Type *bt, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a native - virtual AST_Native *create_native (UTL_ScopedName *n, + virtual AST_Native *create_native (UTL_ScopedName *n, UTL_StrList *p); }; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 1042e5d8ef6..f33c4711120 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (TAO_BE_OUTSTRM_H) +#ifndef TAO_BE_OUTSTRM_H #define TAO_BE_OUTSTRM_H // a dummy structure to inform TAO_OutStream's << operator to put a newline diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index c3004944b60..1def2b42ea5 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (TAO_BE_INTERFACE_H) +#ifndef TAO_BE_INTERFACE_H #define TAO_BE_INTERFACE_H class TAO_OutStream; @@ -130,8 +130,8 @@ public: // is_a method static int downcast_helper (be_interface *, - be_interface *, - TAO_OutStream *os); + be_interface *, + TAO_OutStream *os); // helper method passed to the template method that generates code for the // downcast. @@ -154,8 +154,8 @@ public: // base classes. static int copy_ctor_helper (be_interface *, - be_interface *, - TAO_OutStream *os); + be_interface *, + TAO_OutStream *os); // helper method passed to the template method to invoke ctors of all the // base classes. @@ -172,7 +172,7 @@ public: // generate the operation table including entries for inherited interfaces static const char *relative_name (const char* our_name, - const char *other_class_name); + const char *other_class_name); // relative name for collocated class. int gen_optable_entries (be_interface *); @@ -189,16 +189,16 @@ private: int gen_gperf_things (void); // Run GPERF and get the correct lookup and other operations // depending on which strategy we are using. Returns 0 on sucess, -1 - // on error. + // on error. void gen_perfect_hash_class_definition (void); // Outputs the class definition for the perfect hashing. This class // will inherit from the TAO_Perfect_Hash_OpTable. - + void gen_binary_search_class_definition (void); // Outputs the class definition for the binary search . This class // will inherit from the TAO_Binary_Search_OpTable. - + void gen_linear_search_class_definition (void); // Outputs the class defintion for the linear search. This class // will inherit from the TAO_Linear_Search. @@ -209,12 +209,12 @@ private: void gen_perfect_hash_instance (void); // Create an instance of this perfect hash table. - + void gen_binary_search_instance (void); - // Create an instance of the binary search optable. - + // Create an instance of the binary search optable. + void gen_linear_search_instance (void); - // Create an instance of the linear search optable. + // Create an instance of the linear search optable. char *full_skel_name_; // Fully scoped skeleton name. diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h index db325a152bf..fa17cd7663f 100644 --- a/TAO/TAO_IDL/be_include/be_interface_fwd.h +++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (BE_INTERFACE_FWD_H) +#ifndef BE_INTERFACE_FWD_H #define BE_INTERFACE_FWD_H /* diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h index 68190f9406b..944f85eb302 100644 --- a/TAO/TAO_IDL/be_include/be_module.h +++ b/TAO/TAO_IDL/be_include/be_module.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_MODULE_H) +#ifndef _BE_MODULE_H #define _BE_MODULE_H /* diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h index e049c3d308c..63c043edf5e 100644 --- a/TAO/TAO_IDL/be_include/be_native.h +++ b/TAO/TAO_IDL/be_include/be_native.h @@ -18,7 +18,7 @@ // ============================================================================ -#if !defined (BE_NATIVE_H) +#ifndef BE_NATIVE_H #define BE_NATIVE_H // Representation of "native" IDL type added by the POA spec diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h index 21859abdd96..93f2c2d665e 100644 --- a/TAO/TAO_IDL/be_include/be_operation.h +++ b/TAO/TAO_IDL/be_include/be_operation.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_OPERATION_H) +#ifndef BE_OPERATION_H #define BE_OPERATION_H class be_argument; diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h index 76cc10680e2..c0b2014aead 100644 --- a/TAO/TAO_IDL/be_include/be_predefined_type.h +++ b/TAO/TAO_IDL/be_include/be_predefined_type.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_PREDEFINED_TYPE_H) +#ifndef _BE_PREDEFINED_TYPE_H #define _BE_PREDEFINED_TYPE_H // be_classes.hh @@ -40,7 +40,7 @@ public: // default constructor be_predefined_type (AST_PredefinedType::PredefinedType t, - UTL_ScopedName *n, + UTL_ScopedName *n, UTL_StrList *p); // constructor diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h index d0d1221b7f2..c325419ee3d 100644 --- a/TAO/TAO_IDL/be_include/be_root.h +++ b/TAO/TAO_IDL/be_include/be_root.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_ROOT_H) +#ifndef TAO_BE_ROOT_H #define TAO_BE_ROOT_H class be_root : public virtual AST_Root, diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h index 0378a5dec80..f8aa25516fd 100644 --- a/TAO/TAO_IDL/be_include/be_scope.h +++ b/TAO/TAO_IDL/be_include/be_scope.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_SCOPE_H) +#ifndef TAO_BE_SCOPE_H #define TAO_BE_SCOPE_H class be_decl; diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 3bd5ac71433..8edeeb6ba5b 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_SEQUENCE_H) +#ifndef BE_SEQUENCE_H #define BE_SEQUENCE_H /* diff --git a/TAO/TAO_IDL/be_include/be_state.h b/TAO/TAO_IDL/be_include/be_state.h index 48284bd7813..2b0fc01ce57 100644 --- a/TAO/TAO_IDL/be_include/be_state.h +++ b/TAO/TAO_IDL/be_include/be_state.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if !defined (TAO_BE_STATE_H) +#ifndef TAO_BE_STATE_H #define TAO_BE_STATE_H class be_state @@ -273,7 +273,7 @@ public: }; typedef ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX> - TAO_BE_STATE_ATTRIBUTE; + TAO_BE_STATE_ATTRIBUTE; class be_state_exception : public be_state { @@ -291,6 +291,6 @@ public: }; typedef ACE_Singleton<be_state_exception, ACE_SYNCH_RECURSIVE_MUTEX> - TAO_BE_STATE_EXCEPTION; + TAO_BE_STATE_EXCEPTION; #endif /* end of be_state */ diff --git a/TAO/TAO_IDL/be_include/be_stream_factory.h b/TAO/TAO_IDL/be_include/be_stream_factory.h index 7654afca4fc..4fc14bc1e13 100644 --- a/TAO/TAO_IDL/be_include/be_stream_factory.h +++ b/TAO/TAO_IDL/be_include/be_stream_factory.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_FACTORY_H) +#ifndef TAO_BE_FACTORY_H #define TAO_BE_FACTORY_H class TAO_OutStream_Factory diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h index 7d1067d8d5c..771da6c5c35 100644 --- a/TAO/TAO_IDL/be_include/be_string.h +++ b/TAO/TAO_IDL/be_include/be_string.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_STRING_H) +#ifndef BE_STRING_H #define BE_STRING_H /* diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index 06d7ea5af1f..4d20ad82671 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (BE_STRUCTURE_H) +#ifndef BE_STRUCTURE_H #define BE_STRUCTURE_H /* diff --git a/TAO/TAO_IDL/be_include/be_sunsoft.h b/TAO/TAO_IDL/be_include/be_sunsoft.h index 15b9b9a2568..4686c00750c 100644 --- a/TAO/TAO_IDL/be_include/be_sunsoft.h +++ b/TAO/TAO_IDL/be_include/be_sunsoft.h @@ -5,7 +5,7 @@ // // = LIBRARY // TAO IDL -// +// // = FILENAME // be_sunsoft.h // @@ -14,10 +14,10 @@ // // = AUTHOR // Aniruddha Gokhale -// +// // ============================================================================ -#if !defined (TAO_BE_HELPER_H) +#ifndef TAO_BE_HELPER_H #define TAO_BE_HELPER_H class TAO_SunSoft_OutStream : public TAO_OutStream diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index 20caba78b32..4abcf2e7037 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_TYPE_H) +#ifndef BE_TYPE_H #define BE_TYPE_H class TAO_OutStream; diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h index 83fcfd79160..a0b8dca12c9 100644 --- a/TAO/TAO_IDL/be_include/be_typedef.h +++ b/TAO/TAO_IDL/be_include/be_typedef.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_TYPEDEF_H) +#ifndef BE_TYPEDEF_H #define BE_TYPEDEF_H /* diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h index 332c92d44a0..ee92ff75fa6 100644 --- a/TAO/TAO_IDL/be_include/be_union.h +++ b/TAO/TAO_IDL/be_include/be_union.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_UNION_H) +#ifndef BE_UNION_H #define BE_UNION_H /* diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h index 349db9ff58f..f31fb468ff6 100644 --- a/TAO/TAO_IDL/be_include/be_union_branch.h +++ b/TAO/TAO_IDL/be_include/be_union_branch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (BE_UNION_BRANCH_H) +#ifndef BE_UNION_BRANCH_H #define BE_UNION_BRANCH_H /* diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h index 311e6b94dc9..7f5629ab15b 100644 --- a/TAO/TAO_IDL/be_include/be_union_label.h +++ b/TAO/TAO_IDL/be_include/be_union_label.h @@ -1,12 +1,12 @@ // $Id$ -#if !defined(BE_UNION_LABEL_H) +#ifndef BE_UNION_LABEL_H #define BE_UNION_LABEL_H /* * BE_UnionLabel */ -class be_union_label : public virtual AST_UnionLabel { +class be_union_label : public virtual AST_UnionLabel { public: // Operations be_union_label(); diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h index 4f8f6d9844b..c6d0b00d9fd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor.h +++ b/TAO/TAO_IDL/be_include/be_visitor.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_H) +#ifndef TAO_BE_VISITOR_H #define TAO_BE_VISITOR_H class be_decl; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h index ca44eadd9ea..7528d8e9716 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_H) +#ifndef _BE_VISITOR_ARGUMENT_H #define _BE_VISITOR_ARGUMENT_H #include "be_visitor_decl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h index 7042280a22e..fe811e1104c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_ARGLIST_H_) +#ifndef _BE_VISITOR_ARGUMENT_ARGLIST_H_ #define _BE_VISITOR_ARGUMENT_ARGLIST_H_ class be_visitor_args_arglist : public be_visitor_args diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h index 537811f8b94..882c8003b4a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_ARGUMENT_H_) +#ifndef _BE_VISITOR_ARGUMENT_ARGUMENT_H_ #define _BE_VISITOR_ARGUMENT_ARGUMENT_H_ class be_visitor_args : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h index 3c64dfa570a..e06bfc3baa8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_CS_H_) +#ifndef _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_CS_H_ #define _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h index c588cdb2d52..db6f8da19dd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_SS_H_ #define _BE_VISITOR_ARGUMENT_COMPILED_MARSHAL_SS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h index 0b876370660..03054f5ee01 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/docall_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_DOCALL_CS_H_) +#ifndef _BE_VISITOR_ARGUMENT_DOCALL_CS_H_ #define _BE_VISITOR_ARGUMENT_DOCALL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h index ea26a66fde3..e116238f598 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_MARSHAL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_ #define _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h index e292de4fa0a..b84459c3101 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_POST_DOCALL_CS_H_) +#ifndef _BE_VISITOR_ARGUMENT_POST_DOCALL_CS_H_ #define _BE_VISITOR_ARGUMENT_POST_DOCALL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h index 4988ff66ad2..3b9aa9c8b63 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_marshal_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_POST_MARSHAL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_POST_MARSHAL_SS_H_ #define _BE_VISITOR_ARGUMENT_POST_MARSHAL_SS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h index 7b87ba9bf35..55805fb04f2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h @@ -20,7 +20,7 @@ // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_ #define _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h index f5238423590..fb5acb67951 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_docall_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_PRE_DOCALL_CS_H_) +#ifndef _BE_VISITOR_ARGUMENT_PRE_DOCALL_CS_H_ #define _BE_VISITOR_ARGUMENT_PRE_DOCALL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h index 6e938db5e6f..9edb4b60288 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_invoke_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_PRE_INVOKE_CS_H_) +#ifndef _BE_VISITOR_ARGUMENT_PRE_INVOKE_CS_H_ #define _BE_VISITOR_ARGUMENT_PRE_INVOKE_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h index 24bf3e88054..bb2b3430e79 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/pre_upcall_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_PRE_UPCALL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_PRE_UPCALL_SS_H_ #define _BE_VISITOR_ARGUMENT_PRE_UPCALL_SS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h index 5bd504fcded..cd7707f74f3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_UPCALL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_UPCALL_SS_H_ #define _BE_VISITOR_ARGUMENT_UPCALL_SS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h index 73e301441f5..a09695a383c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARGUMENT_VARDECL_SS_H_) +#ifndef _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ #define _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ // ************************************************************ @@ -89,7 +89,7 @@ class be_compiled_visitor_args_vardecl_ss : public be_visitor_args_vardecl_ss // // = DESCRIPTION // Visitor for variable declaration for argument for compiled marshaling - // skeletons + // skeletons // public: be_compiled_visitor_args_vardecl_ss (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array.h b/TAO/TAO_IDL/be_include/be_visitor_array.h index 506bde6b54b..3e905175e85 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_ARRAY_H) +#ifndef TAO_BE_VISITOR_ARRAY_H #define TAO_BE_VISITOR_ARRAY_H #include "be_visitor_decl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h index dffce321f77..8030e83f6cc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_ARRAY_ANY_OP_CH_H_ #define _BE_VISITOR_ARRAY_ANY_OP_CH_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h index fc3c814c0d6..58b310587e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_ARRAY_ANY_OP_CS_H_ #define _BE_VISITOR_ARRAY_ANY_OP_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array.h b/TAO/TAO_IDL/be_include/be_visitor_array/array.h index 0a9510ce383..5fa6a4aab4c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_ARRAY_H_) +#ifndef _BE_VISITOR_ARRAY_ARRAY_H_ #define _BE_VISITOR_ARRAY_ARRAY_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h index 7a859d85527..7882a381546 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_CH_H_) +#ifndef _BE_VISITOR_ARRAY_CH_H_ #define _BE_VISITOR_ARRAY_CH_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h index 3cb5f06cb6d..887540367e7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_CI_H_) +#ifndef _BE_VISITOR_ARRAY_CI_H_ #define _BE_VISITOR_ARRAY_CI_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h index 101ce40ce31..98c3e8f6c2c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_CS_H_) +#ifndef _BE_VISITOR_ARRAY_CS_H_ #define _BE_VISITOR_ARRAY_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h index 53766d3be77..a45af118541 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_ARRAY_CDR_OP_CH_H_ #define _BE_VISITOR_ARRAY_CDR_OP_CH_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h index c02c51112f5..b68754ae0d3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ARRAY_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_ARRAY_CDR_OP_CS_H_ #define _BE_VISITOR_ARRAY_CDR_OP_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute.h index 0e9fb275ae6..9c5aa46988e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_ATTRIBUTE_H) +#ifndef TAO_BE_VISITOR_ATTRIBUTE_H #define TAO_BE_VISITOR_ATTRIBUTE_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h index c330de69537..1c2493722c0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H) +#ifndef _BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H #define _BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant.h b/TAO/TAO_IDL/be_include/be_visitor_constant.h index 4bd864c7aa3..acc6f65d31f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_CONSTANT_H) +#ifndef TAO_BE_VISITOR_CONSTANT_H #define TAO_BE_VISITOR_CONSTANT_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h index 3d6113ddbd6..c0e53447176 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_CONSTANT_CONSTANT_CH_H_) +#ifndef _BE_VISITOR_CONSTANT_CONSTANT_CH_H_ #define _BE_VISITOR_CONSTANT_CONSTANT_CH_H_ class be_visitor_constant_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h index 104614536a1..db2fccf96ca 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_CONSTANT_CONSTANT_CS_H_) +#ifndef _BE_VISITOR_CONSTANT_CONSTANT_CS_H_ #define _BE_VISITOR_CONSTANT_CONSTANT_CS_H_ class be_visitor_constant_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 02e07dda533..0487711615a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -23,7 +23,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_CONTEXT_H) +#ifndef TAO_BE_VISITOR_CONTEXT_H #define TAO_BE_VISITOR_CONTEXT_H class be_visitor_context diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h index 4c8f575cacd..34cf441e82f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_DECL_H) +#ifndef TAO_BE_VISITOR_DECL_H #define TAO_BE_VISITOR_DECL_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum.h b/TAO/TAO_IDL/be_include/be_visitor_enum.h index a195680786f..6b0ea40bce4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_ENUM_H) +#ifndef TAO_BE_VISITOR_ENUM_H #define TAO_BE_VISITOR_ENUM_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h index 469e661bb2c..f9d25ecf81c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ENUM_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_ENUM_ANY_OP_CH_H_ #define _BE_VISITOR_ENUM_ANY_OP_CH_H_ class be_visitor_enum_any_op_ch : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h index aab50eb6305..f3db76c2be4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ENUM_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_ENUM_ANY_OP_CS_H_ #define _BE_VISITOR_ENUM_ANY_OP_CS_H_ class be_visitor_enum_any_op_cs : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h index 883b226c9f1..c8ba0e49f81 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ENUM_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_ENUM_CDR_OP_CH_H_ #define _BE_VISITOR_ENUM_CDR_OP_CH_H_ class be_visitor_enum_cdr_op_ch : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h index 5e995f7a117..41c89b9c605 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ENUM_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_ENUM_CDR_OP_CS_H_ #define _BE_VISITOR_ENUM_CDR_OP_CS_H_ class be_visitor_enum_cdr_op_cs : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h index 29f05b68b68..8a3f922dce4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ENUM_ENUM_CH_H_) +#ifndef _BE_VISITOR_ENUM_ENUM_CH_H_ #define _BE_VISITOR_ENUM_ENUM_CH_H_ class be_visitor_enum_ch : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h index f1684ff1d01..a40455f2190 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ENUM_ENUM_CS_H_) +#ifndef _BE_VISITOR_ENUM_ENUM_CS_H_ #define _BE_VISITOR_ENUM_ENUM_CS_H_ class be_visitor_enum_cs : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception.h index 30ae6f06733..36e4e25a2a9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_EXCEPTION_H) +#ifndef TAO_BE_VISITOR_EXCEPTION_H #define TAO_BE_VISITOR_EXCEPTION_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h index 6ad35719449..ee3ff396dc1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_ #define _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_ class be_visitor_exception_any_op_ch : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h index dc96479b918..45a82cb7e23 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_ #define _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_ class be_visitor_exception_any_op_cs : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h index e24b4299deb..dd5df6266e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_EXCEPTION_CDR_OP_CH_H_ #define _BE_VISITOR_EXCEPTION_CDR_OP_CH_H_ class be_visitor_exception_cdr_op_ch : public be_visitor_exception diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h index b9d3b09df8f..a77f6c4bdf7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_ #define _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_ class be_visitor_exception_cdr_op_cs : public be_visitor_exception diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h index 00e55741db1..80529d2a203 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_CTOR_H_) +#ifndef _BE_VISITOR_EXCEPTION_CTOR_H_ #define _BE_VISITOR_EXCEPTION_CTOR_H_ class be_visitor_exception_ctor : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h index e40610ac2fb..52b6ab67dd7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_) +#ifndef _BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_ #define _BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_ class be_visitor_exception_ctor_assign : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h index f7e4bab2d26..c4be6b317dc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_H_) +#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_H_ #define _BE_VISITOR_EXCEPTION_EXCEPTION_H_ class be_visitor_exception : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h index 9211782a96e..c664d166593 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_) +#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_ #define _BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_ class be_visitor_exception_ch : public be_visitor_exception diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h index 67ca3e1c449..ccd48fbb07b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_) +#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_ #define _BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_ class be_visitor_exception_ci : public be_visitor_exception diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h index 0b1edd4cc6c..a3d0c0e9c62 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_) +#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_ #define _BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_ class be_visitor_exception_cs : public be_visitor_exception diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h index 539d12efa79..fd0ddf8ff0c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_) +#ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_ #define _BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_ class be_visitor_exception_ctor : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_factory.h b/TAO/TAO_IDL/be_include/be_visitor_factory.h index ad4c6e9a385..2061b51bb04 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_factory.h +++ b/TAO/TAO_IDL/be_include/be_visitor_factory.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_FACTORY_H) +#ifndef TAO_BE_VISITOR_FACTORY_H #define TAO_BE_VISITOR_FACTORY_H class TAO_Visitor_Factory diff --git a/TAO/TAO_IDL/be_include/be_visitor_field.h b/TAO/TAO_IDL/be_include/be_visitor_field.h index 2aac718e368..4add3db5af9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_FIELD_H) +#ifndef TAO_BE_VISITOR_FIELD_H #define TAO_BE_VISITOR_FIELD_H #include "be_visitor_decl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h index e9fb3139e6a..0e3a9555fd6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_FIELD_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_FIELD_CDR_OP_CH_H_ #define _BE_VISITOR_FIELD_CDR_OP_CH_H_ class be_visitor_field_cdr_op_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h index 7b4ac51064d..a8f40964b3a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_FIELD_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_FIELD_CDR_OP_CS_H_ #define _BE_VISITOR_FIELD_CDR_OP_CS_H_ class be_visitor_field_cdr_op_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h index aa72105c520..a3fc7ce30db 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_FIELD_CH_H_) +#ifndef _BE_VISITOR_FIELD_CH_H_ #define _BE_VISITOR_FIELD_CH_H_ class be_visitor_field_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h index 0e2c3797a5e..b2b71678b70 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_FIELD_CI_H_) +#ifndef _BE_VISITOR_FIELD_CI_H_ #define _BE_VISITOR_FIELD_CI_H_ class be_visitor_field_ci : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h index 7edaae3b4c2..c48a1fd5969 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_FIELD_CS_H_) +#ifndef _BE_VISITOR_FIELD_CS_H_ #define _BE_VISITOR_FIELD_CS_H_ class be_visitor_field_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h index 622bda773c9..5b75ba2275f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_INTERFACE_H) +#ifndef TAO_BE_VISITOR_INTERFACE_H #define TAO_BE_VISITOR_INTERFACE_H #include "be_visitor_scope.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h index 4e635bfd8a3..0b25ff3f3be 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_ANY_OP_CH_H_) +#ifndef _BE_INTERFACE_ANY_OP_CH_H_ #define _BE_INTERFACE_ANY_OP_CH_H_ class be_visitor_interface_any_op_ch : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h index 012aca9d3f8..aa84f6fd2c9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_ANY_OP_CS_H_) +#ifndef _BE_INTERFACE_ANY_OP_CS_H_ #define _BE_INTERFACE_ANY_OP_CS_H_ class be_visitor_interface_any_op_cs : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h index e8b3777cfe0..353659c3bcc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_INTERFACE_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_INTERFACE_CDR_OP_CH_H_ #define _BE_VISITOR_INTERFACE_CDR_OP_CH_H_ class be_visitor_interface_cdr_op_ch : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h index e83f6546892..05a062d594f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_INTERFACE_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_INTERFACE_CDR_OP_CS_H_ #define _BE_VISITOR_INTERFACE_CDR_OP_CS_H_ class be_visitor_interface_cdr_op_cs : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h index a96c5a6701d..a050c3fb47f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_sh.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_COLLOCATED_SH_H_) +#ifndef _BE_INTERFACE_COLLOCATED_SH_H_ #define _BE_INTERFACE_COLLOCATED_SH_H_ class be_visitor_interface_collocated_sh : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h index ad49cbb1448..a7ffeb3149e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/collocated_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_COLLOCATED_SS_H_) +#ifndef _BE_INTERFACE_COLLOCATED_SS_H_ #define _BE_INTERFACE_COLLOCATED_SS_H_ class be_visitor_interface_collocated_ss : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h index 086c8f1b56b..41dfd82b0a5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_H_) +#ifndef _BE_INTERFACE_INTERFACE_H_ #define _BE_INTERFACE_INTERFACE_H_ // = DESCRIPTION diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h index 7dc997f7f15..34bea04cac1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_CH_H_) +#ifndef _BE_INTERFACE_INTERFACE_CH_H_ #define _BE_INTERFACE_INTERFACE_CH_H_ // we need derived interface visitors for the client and server header files. For diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h index 4eff86b2099..ad1a5b31063 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_CI_H_) +#ifndef _BE_INTERFACE_INTERFACE_CI_H_ #define _BE_INTERFACE_INTERFACE_CI_H_ class be_visitor_interface_ci : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h index 7acede89420..51e3f8a7a88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_CS_H_) +#ifndef _BE_INTERFACE_INTERFACE_CS_H_ #define _BE_INTERFACE_INTERFACE_CS_H_ class be_visitor_interface_cs : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h index a2f09833147..526a92af825 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_SH_H_) +#ifndef _BE_INTERFACE_INTERFACE_SH_H_ #define _BE_INTERFACE_INTERFACE_SH_H_ class be_visitor_interface_sh : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h index e8c7bae245c..c46560a433d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_SI_H_) +#ifndef _BE_INTERFACE_INTERFACE_SI_H_ #define _BE_INTERFACE_INTERFACE_SI_H_ class be_visitor_interface_si : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h index 78c5d48cbab..e57a272a3be 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_SS_H_) +#ifndef _BE_INTERFACE_INTERFACE_SS_H_ #define _BE_INTERFACE_INTERFACE_SS_H_ class be_visitor_interface_ss : public be_visitor_interface diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h index 7516337310e..bd2fbfbae13 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_TIE_SH_H_) +#ifndef _BE_INTERFACE_TIE_SH_H_ #define _BE_INTERFACE_TIE_SH_H_ class be_visitor_interface_tie_sh : public be_visitor_interface @@ -43,8 +43,8 @@ public: // set the right context and make a visitor static int method_helper (be_interface *, - be_interface *, - TAO_OutStream *os); + be_interface *, + TAO_OutStream *os); // helper method to generate method declaration in the TIE classes. }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h index fe3fb0ac09b..f8a9f982946 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_TIE_SI_H_) +#ifndef _BE_INTERFACE_TIE_SI_H_ #define _BE_INTERFACE_TIE_SI_H_ class be_visitor_interface_tie_si : public be_visitor_interface @@ -44,8 +44,8 @@ public: // set the right context and make a visitor static int method_helper (be_interface *, - be_interface *, - TAO_OutStream *os); + be_interface *, + TAO_OutStream *os); // helper method to generate method declaration in the TIE classes. }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h index e139af36707..14104e4d229 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_INTERFACE_FWD_H) +#ifndef TAO_BE_VISITOR_INTERFACE_FWD_H #define TAO_BE_VISITOR_INTERFACE_FWD_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h index 788faa611db..02c788c071b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_FWD_CH_H_) +#ifndef _BE_INTERFACE_INTERFACE_FWD_CH_H_ #define _BE_INTERFACE_INTERFACE_FWD_CH_H_ class be_visitor_interface_fwd_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h index a53bd7d7a05..f8c765d986f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ci.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_INTERFACE_INTERFACE_FWD_CI_H_) +#ifndef _BE_INTERFACE_INTERFACE_FWD_CI_H_ #define _BE_INTERFACE_INTERFACE_FWD_CI_H_ class be_visitor_interface_fwd_ci : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_module.h b/TAO/TAO_IDL/be_include/be_visitor_module.h index e118aa98a0a..3e1dd4c85f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_MODULE_H) +#ifndef TAO_BE_VISITOR_MODULE_H #define TAO_BE_VISITOR_MODULE_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h index ab941bc345b..a41fec48195 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_MODULE_ANY_OP_H_) +#ifndef _BE_VISITOR_MODULE_ANY_OP_H_ #define _BE_VISITOR_MODULE_ANY_OP_H_ class be_visitor_module_any_op : public be_visitor_module diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h index 71aef9e34a4..78a56a082f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_MODULE_CDR_OP_H_) +#ifndef _BE_VISITOR_MODULE_CDR_OP_H_ #define _BE_VISITOR_MODULE_CDR_OP_H_ class be_visitor_module_cdr_op : public be_visitor_module diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h index 58c4f951cb8..1949e865ef7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_MODULE_MODULE_H_) +#ifndef _BE_VISITOR_MODULE_MODULE_H_ #define _BE_VISITOR_MODULE_MODULE_H_ class be_visitor_module : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h index f001d3e4900..5de940fa34f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_MODULE_MODULE_CH_H_) +#ifndef _BE_VISITOR_MODULE_MODULE_CH_H_ #define _BE_VISITOR_MODULE_MODULE_CH_H_ class be_visitor_module_ch : public be_visitor_module diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h index 0ee2c25379c..c0b6dfc5b37 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_MODULE_MODULE_SH_H_) +#ifndef _BE_VISITOR_MODULE_MODULE_SH_H_ #define _BE_VISITOR_MODULE_MODULE_SH_H_ class be_visitor_module_sh : public be_visitor_module diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h index 321b70b551f..50cc82bde56 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_OPERATION_H) +#ifndef TAO_BE_VISITOR_OPERATION_H #define TAO_BE_VISITOR_OPERATION_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h index 42f418a97ed..67de889815a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_ARGLIST_H_) +#ifndef _BE_VISITOR_OPERATION_ARGLIST_H_ #define _BE_VISITOR_OPERATION_ARGLIST_H_ // ****************************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h index d8c91145465..08e41106e3f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_ARGUMENT_H_) +#ifndef _BE_VISITOR_OPERATION_ARGUMENT_H_ #define _BE_VISITOR_OPERATION_ARGUMENT_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h index ecbea2acdc6..06e47f6b16a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h @@ -13,21 +13,21 @@ // = DESCRIPTION // Visitor for generating code for IDL operations. This is a visitor for // passing arguments to the CDR operators in a compiled marshaling -// stub/skeleton +// stub/skeleton // // = AUTHOR // Aniruddha Gokhale // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_) +#ifndef _BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_ #define _BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_ // ************************************************************ // generic operation visitor for docall, upcall, pre/post // ************************************************************ -class be_compiled_visitor_operation_argument_invoke +class be_compiled_visitor_operation_argument_invoke : public be_visitor_operation_argument { // @@ -51,7 +51,7 @@ public: virtual int post_process (be_decl *bd); // stuff to o/p after each element of the scope is handled - enum LAST_ARG_PRINTED + enum LAST_ARG_PRINTED { TAO_ARG_NONE, TAO_ARG_IN, diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h index ef4d1551480..e483d001735 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h @@ -13,21 +13,21 @@ // = DESCRIPTION // Visitor for generating code for IDL operations. This is a visitor for // passing arguments to the CDR operators in a compiled marshaling -// stub/skeleton +// stub/skeleton // // = AUTHOR // Aniruddha Gokhale // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_) +#ifndef _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_ #define _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_ // ************************************************************ // generic operation visitor for docall, upcall, pre/post // ************************************************************ -class be_compiled_visitor_operation_argument_marshal +class be_compiled_visitor_operation_argument_marshal : public be_visitor_operation_argument { // @@ -51,7 +51,7 @@ public: virtual int post_process (be_decl *bd); // stuff to o/p after each element of the scope is handled - enum LAST_ARG_PRINTED + enum LAST_ARG_PRINTED { TAO_ARG_NONE, TAO_ARG_IN, diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h index dc31959e345..805846419e4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_sh.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_COLLOCATED_SH_H_) +#ifndef _BE_VISITOR_OPERATION_COLLOCATED_SH_H_ #define _BE_VISITOR_OPERATION_COLLOCATED_SH_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h index 48b7966e9aa..e0aac140703 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_COLLOCATED_SS_H_) +#ifndef _BE_VISITOR_OPERATION_COLLOCATED_SS_H_ #define _BE_VISITOR_OPERATION_COLLOCATED_SS_H_ // ***************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h index c6d1477c585..6ebfa0a3e80 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_ #define _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h index 32c9e1c3d22..9e6d44f8848 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_) +#ifndef _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_ #define _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_ // ****************************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h index e0b0be28792..79e63a0ba13 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_OPERATION_H_) +#ifndef _BE_VISITOR_OPERATION_OPERATION_H_ #define _BE_VISITOR_OPERATION_OPERATION_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h index 9ba8128f0c6..1567182e5d6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_OPERATION_CH_H_) +#ifndef _BE_VISITOR_OPERATION_OPERATION_CH_H_ #define _BE_VISITOR_OPERATION_OPERATION_CH_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h index e5f9ae92f07..e8d029f8a35 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_OPERATION_CS_H_) +#ifndef _BE_VISITOR_OPERATION_OPERATION_CS_H_ #define _BE_VISITOR_OPERATION_OPERATION_CS_H_ // ************************************************************ @@ -59,7 +59,7 @@ public: virtual int post_process (be_decl *); // stuff to output after every member of the scope is handled - virtual int gen_raise_exception (be_type *, + virtual int gen_raise_exception (be_type *, const char * excep, const char * status); // helper that generates code for raising an exception diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h index cf2e06f4b28..9f5b04a6997 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_OPERATION_SH_H_) +#ifndef _BE_VISITOR_OPERATION_OPERATION_SH_H_ #define _BE_VISITOR_OPERATION_OPERATION_SH_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h index 03124ef8b4b..aac5af2ed74 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_OPERATION_SS_H_) +#ifndef _BE_VISITOR_OPERATION_OPERATION_SS_H_ #define _BE_VISITOR_OPERATION_OPERATION_SS_H_ // ************************************************************ @@ -63,7 +63,7 @@ public: virtual int post_process (be_decl *); // stuff to output after every member of the scope is handled - virtual int gen_raise_exception (be_type *, + virtual int gen_raise_exception (be_type *, const char * excep, const char * status, const char * env); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h index 9a4fc0a8ac3..9a196b55d48 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_H_ #define _BE_VISITOR_OPERATION_RETTYPE_H_ // *********************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h index ff35c744e62..c43e3094c57 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_ASSIGN_SS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_ASSIGN_SS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_ASSIGN_SS_H_ // *********************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h index eb3b287ce9c..bb7de8fe3ad 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h index b3f95579a6a..644f9d27fbd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SSH_ // *********************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h index e2299617a35..5efdc22d2a2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h index 6cfbd7566ed..1895cb7983d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_ // *********************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h index 5c6f3723448..2a11b2cd605 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h index 1d5306ad9e1..2abe28ed76f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h index ec9b8383342..05626351ea5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_RETURN_CS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_RETURN_CS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h index ca9b7ba99e7..f7bce1756ab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_VARDECL_CS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_VARDECL_CS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_VARDECL_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h index 4cef49b9bde..ba942a2bbfd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_) +#ifndef _BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_ #define _BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_ // ************************************************************ @@ -79,10 +79,10 @@ public: // ************************************************************ // Operation visitor for return type variable declaration in the server // skeleton using compiled marshaling. This one overrides 2 methods of the base -// class +// class // ************************************************************ -class be_compiled_visitor_operation_rettype_vardecl_ss : +class be_compiled_visitor_operation_rettype_vardecl_ss : public be_visitor_operation_rettype_vardecl_ss { // diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h index f5329bfe963..14d0f2a4243 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_TIE_SH_H_) +#ifndef _BE_VISITOR_OPERATION_TIE_SH_H_ #define _BE_VISITOR_OPERATION_TIE_SH_H_ // *********************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h index f6168878069..e38012009a7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_OPERATION_TIE_SI_H_) +#ifndef _BE_VISITOR_OPERATION_TIE_SI_H_ #define _BE_VISITOR_OPERATION_TIE_SI_H_ // *********************************************************************** diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h index 0bc0434cfe8..5a006875e0d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_ROOT_H) +#ifndef TAO_BE_VISITOR_ROOT_H #define TAO_BE_VISITOR_ROOT_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h index 55bea266f7b..e7c0ea72c0c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ANY_OP_H_) +#ifndef _BE_VISITOR_ROOT_ANY_OP_H_ #define _BE_VISITOR_ROOT_ANY_OP_H_ class be_visitor_root_any_op : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h index 2c6675c0206..2df86ebcdfe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_CDR_OP_H_) +#ifndef _BE_VISITOR_ROOT_CDR_OP_H_ #define _BE_VISITOR_ROOT_CDR_OP_H_ class be_visitor_root_cdr_op : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h index 106bf26355d..79507d2254b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_H_ #define _BE_VISITOR_ROOT_ROOT_H_ class be_visitor_root : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h index 47dd1f09b56..c36cf7f5192 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_CH_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_CH_H_ #define _BE_VISITOR_ROOT_ROOT_CH_H_ class be_visitor_root_ch : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h index 1362397511b..e39eab1ac4f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_CI_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_CI_H_ #define _BE_VISITOR_ROOT_ROOT_CI_H_ class be_visitor_root_ci : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h index e8462a0df49..64b5df10792 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_CS_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_CS_H_ #define _BE_VISITOR_ROOT_ROOT_CS_H_ class be_visitor_root_cs : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h index 45a15201de8..d1c42ca580e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_SH_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_SH_H_ #define _BE_VISITOR_ROOT_ROOT_SH_H_ class be_visitor_root_sh : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h index 5ff6648ebb8..b615a08d69d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_SI_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_SI_H_ #define _BE_VISITOR_ROOT_ROOT_SI_H_ class be_visitor_root_si : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h index 412f93df56b..0c75d137122 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_ROOT_ROOT_SS_H_) +#ifndef _BE_VISITOR_ROOT_ROOT_SS_H_ #define _BE_VISITOR_ROOT_ROOT_SS_H_ class be_visitor_root_ss : public be_visitor_root diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h index 900dbc7a6f3..095dee0ae32 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_scope.h +++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_SCOPE_H) +#ifndef TAO_BE_VISITOR_SCOPE_H #define TAO_BE_VISITOR_SCOPE_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence.h b/TAO/TAO_IDL/be_include/be_visitor_sequence.h index a2e1a502a14..e8ec94d7573 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence.h @@ -3,7 +3,7 @@ // $Id$ // -#if !defined (TAO_BE_VISITOR_SEQUENCE_H) +#ifndef TAO_BE_VISITOR_SEQUENCE_H #define TAO_BE_VISITOR_SEQUENCE_H #include "be_visitor_decl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h index b0b1f8a666e..71cc3bf65c5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_ #define _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_ class be_visitor_sequence_any_op_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h index 4252635baef..fdb3e422d14 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_ #define _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_ class be_visitor_sequence_any_op_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h index 449e5efd482..1fe1880f3dd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_) +#ifndef _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_ #define _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_ class be_visitor_sequence_buffer_type : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h index 8503f16471f..ca3f1b85856 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_ #define _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_ class be_visitor_sequence_cdr_op_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h index 4015f388910..1a36b175013 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_ #define _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_ // ************************************************************ diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h index 88212e3ac0e..c307db5fa6e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/elemtype.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_ELEMTYPE_H_) +#ifndef _BE_VISITOR_SEQUENCE_ELEMTYPE_H_ #define _BE_VISITOR_SEQUENCE_ELEMTYPE_H_ class be_visitor_sequence_elemtype : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h index 71673e2c230..ef1ac6a4cd2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_) +#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_ #define _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_ class be_visitor_sequence_base : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h index 412b9c6ad57..5babfec9fd9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_) +#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_ #define _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_ class be_visitor_sequence_ch : public be_visitor_decl @@ -57,10 +57,10 @@ public: // generate a instance of the bounded object sequence virtual int gen_bounded_str_sequence (be_sequence *node); - // generate a instance of the bounded string sequence + // generate a instance of the bounded string sequence virtual int instantiate_sequence (be_sequence *node); - // determine which sequence to instantiate + // determine which sequence to instantiate virtual int gen_object_manager (be_sequence *node); // generate a instance of the object manager diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h index fbe8890c7c8..c2b8508fe7a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_) +#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_ #define _BE_VISITOR_SEQUENCE_SEQUENCE_CI_H_ class be_visitor_sequence_ci : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h index c159491108d..6751e0ca749 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_) +#ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_ #define _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_ class be_visitor_sequence_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure.h index c4c69c57013..b4e229b481c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_STRUCTURE_H) +#ifndef TAO_BE_VISITOR_STRUCTURE_H #define TAO_BE_VISITOR_STRUCTURE_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h index 1bd7384f191..935a74aedc8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_ #define _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_ class be_visitor_structure_any_op_ch : public be_visitor_structure diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h index 1ee098a905a..65829b3ff15 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_ #define _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_ class be_visitor_structure_any_op_cs : public be_visitor_structure diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h index 029c6ef3a51..4c082357b19 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_ #define _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_ class be_visitor_structure_cdr_op_ch : public be_visitor_structure diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h index 9510c2d91be..3a7ca3d24a3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_ #define _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_ class be_visitor_structure_cdr_op_cs : public be_visitor_structure diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h index a10531ccf9c..01a64e3f342 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_H_) +#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_H_ #define _BE_VISITOR_STRUCTURE_STRUCTURE_H_ class be_visitor_structure : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h index f946d033288..1ec6f9d6ccb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_) +#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_ #define _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_ class be_visitor_structure_ch : public be_visitor_structure diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h index ac47118f00d..8665832e078 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_) +#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_ #define _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_ class be_visitor_structure_ci : public be_visitor_structure diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h index a2fb142c02e..bf4adfa0000 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_) +#ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_ #define _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_ class be_visitor_structure_cs : public be_visitor_structure @@ -41,7 +41,7 @@ public: // destructor virtual int visit_structure (be_structure *node); - // visit structure. + // visit structure. }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode.h index cbd083c4fb7..3f00ab6a94a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_TYPECODE_H) +#ifndef TAO_BE_VISITOR_TYPECODE_H #define TAO_BE_VISITOR_TYPECODE_H #include "be_visitor_decl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h index c6f67b4fc4a..85e3f6bcea4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPECODE_TYPECODE_DECL_H_) +#ifndef _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_ #define _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_ class be_visitor_typecode_decl : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index b87b57dfa05..e3a1765d864 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_) +#ifndef _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_ #define _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_ class be_visitor_typecode_defn : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef.h index 26a89412edd..e333e4d8e08 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_TYPEDEF_H) +#ifndef TAO_BE_VISITOR_TYPEDEF_H #define TAO_BE_VISITOR_TYPEDEF_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h index 915465ed1fb..a614a30f71a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_ #define _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_ class be_visitor_typedef_any_op_ch : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h index 9014b277d1d..f99033d4f43 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_ #define _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_ class be_visitor_typedef_any_op_cs : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h index 82f72053396..87eb5834063 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_ #define _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_ class be_visitor_typedef_cdr_op_ch : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h index 2301ba617a5..09269214b96 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_ #define _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_ class be_visitor_typedef_cdr_op_cs : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h index 4b9f9f48507..d0d1b297ae2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_H_) +#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_H_ #define _BE_VISITOR_TYPEDEF_TYPEDEF_H_ class be_visitor_typedef : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h index a18b580d489..eda0adf5441 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_) +#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_ #define _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_ class be_visitor_typedef_ch : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h index 38c0276c33a..9f308d33d52 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_) +#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_ #define _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_ class be_visitor_typedef_ci : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h index 091ac01e22c..a546de4c38d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h @@ -22,7 +22,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_) +#ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_ #define _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_ class be_visitor_typedef_cs : public be_visitor_typedef diff --git a/TAO/TAO_IDL/be_include/be_visitor_union.h b/TAO/TAO_IDL/be_include/be_visitor_union.h index 6677a26284d..e235ec7cbff 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_UNION_H) +#ifndef TAO_BE_VISITOR_UNION_H #define TAO_BE_VISITOR_UNION_H #include "be_visitor.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h index 2f045164396..20d7ed97b4f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_ANY_OP_CH_H_) +#ifndef _BE_VISITOR_UNION_ANY_OP_CH_H_ #define _BE_VISITOR_UNION_ANY_OP_CH_H_ class be_visitor_union_any_op_ch : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h index 95bf8baaa82..7f6ea89b519 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_ANY_OP_CS_H_) +#ifndef _BE_VISITOR_UNION_ANY_OP_CS_H_ #define _BE_VISITOR_UNION_ANY_OP_CS_H_ class be_visitor_union_any_op_cs : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h index 3f92aefd860..972dacf1335 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_UNION_CDR_OP_CH_H_ #define _BE_VISITOR_UNION_CDR_OP_CH_H_ class be_visitor_union_cdr_op_ch : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h index da3d1ea6404..a57a7dfb859 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_UNION_CDR_OP_CS_H_ #define _BE_VISITOR_UNION_CDR_OP_CS_H_ class be_visitor_union_cdr_op_cs : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h index 5c46ba2cd58..950deb597cd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_DISCRIMINANT_CH_H_) +#ifndef _BE_VISITOR_UNION_DISCRIMINANT_CH_H_ #define _BE_VISITOR_UNION_DISCRIMINANT_CH_H_ class be_visitor_union_discriminant_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h index bb44c2f12ee..3e7619a939e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_DISCRIMINANT_CI_H_) +#ifndef _BE_VISITOR_UNION_DISCRIMINANT_CI_H_ #define _BE_VISITOR_UNION_DISCRIMINANT_CI_H_ class be_visitor_union_discriminant_ci : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h index 23cbe129a22..af61beb8b4d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_DISCRIMINANT_CS_H_) +#ifndef _BE_VISITOR_UNION_DISCRIMINANT_CS_H_ #define _BE_VISITOR_UNION_DISCRIMINANT_CS_H_ class be_visitor_union_discriminant_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union.h b/TAO/TAO_IDL/be_include/be_visitor_union/union.h index 568f32b6d8b..5e669ac9327 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_UNION_H_) +#ifndef _BE_VISITOR_UNION_UNION_H_ #define _BE_VISITOR_UNION_UNION_H_ class be_visitor_union : public be_visitor_scope diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h index 5d2f389fb5e..86813169ff1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_UNION_CH_H_) +#ifndef _BE_VISITOR_UNION_UNION_CH_H_ #define _BE_VISITOR_UNION_UNION_CH_H_ class be_visitor_union_ch : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h index b0a2c52afe5..d0d138f583d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_UNION_CI_H_) +#ifndef _BE_VISITOR_UNION_UNION_CI_H_ #define _BE_VISITOR_UNION_UNION_CI_H_ class be_visitor_union_ci : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h index 3a6ef0322aa..04783afa7d9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h @@ -20,7 +20,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_UNION_CS_H_) +#ifndef _BE_VISITOR_UNION_UNION_CS_H_ #define _BE_VISITOR_UNION_UNION_CS_H_ class be_visitor_union_cs : public be_visitor_union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h index 970addf09a5..55d525a11a1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h @@ -18,7 +18,7 @@ // // ============================================================================ -#if !defined (TAO_BE_VISITOR_UNION_BRANCH_H) +#ifndef TAO_BE_VISITOR_UNION_BRANCH_H #define TAO_BE_VISITOR_UNION_BRANCH_H #include "be_visitor_decl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h index 09ccb3bf744..e325b41f912 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_ #define _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_ class be_visitor_union_branch_cdr_op_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h index c679327e1e0..2a912a3c138 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h @@ -19,7 +19,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_ #define _BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_ class be_visitor_union_branch_cdr_op_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h index 5037fb586ea..fdc7e9f2070 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_ #define _BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_ class be_visitor_union_branch_private_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h index 39a2085dd8b..b1d76206108 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_access_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_ACCESS_CS_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_ACCESS_CS_H_ #define _BE_VISITOR_UNION_BRANCH_PUBLIC_ACCESS_CS_H_ class be_visitor_union_branch_public_access_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h index 8bf78d57eb1..fe324e600d0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_ #define _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_ class be_visitor_union_branch_public_assign_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h index 43387f44cfa..d0deb7bc4f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_ #define _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_ class be_visitor_union_branch_public_ch : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h index 7462bdfe3de..585d8f0453d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_) +#ifndef _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_ #define _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_ class be_visitor_union_branch_public_ci : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h index f727b019644..c66e142c280 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_) +#ifndef _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_ #define _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_ class be_visitor_union_branch_public_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h index 6e92074db2a..e7fa0b7733a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h @@ -21,7 +21,7 @@ // // ============================================================================ -#if !defined (_BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_) +#ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_ #define _BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_ class be_visitor_union_branch_public_reset_cs : public be_visitor_decl diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h index 88a7834e196..4747b1ed899 100644 --- a/TAO/TAO_IDL/fe/y.tab.h +++ b/TAO/TAO_IDL/fe/y.tab.h @@ -1,33 +1,33 @@ // $Id$ typedef union #ifdef __cplusplus - TAO_YYSTYPE + TAO_YYSTYPE #endif { - AST_Decl *dcval; /* Decl value */ - UTL_StrList *slval; /* String list */ - UTL_NameList *nlval; /* Name list */ - UTL_ExprList *elval; /* Expression list */ - UTL_LabelList *llval; /* Label list */ - UTL_DeclList *dlval; /* Declaration list */ - FE_InterfaceHeader *ihval; /* Interface header */ - AST_Expression *exval; /* Expression value */ - AST_UnionLabel *ulval; /* Union label */ - AST_Field *ffval; /* Field value */ - AST_Expression::ExprType etval; /* Expression type */ - AST_Argument::Direction dival; /* Argument direction */ - AST_Operation::Flags ofval; /* Operation flags */ - FE_Declarator *deval; /* Declarator value */ - idl_bool bval; /* Boolean value */ - long ival; /* Long value */ - double dval; /* Double value */ - float fval; /* Float value */ - char cval; /* Char value */ + AST_Decl *dcval; /* Decl value */ + UTL_StrList *slval; /* String list */ + UTL_NameList *nlval; /* Name list */ + UTL_ExprList *elval; /* Expression list */ + UTL_LabelList *llval; /* Label list */ + UTL_DeclList *dlval; /* Declaration list */ + FE_InterfaceHeader *ihval; /* Interface header */ + AST_Expression *exval; /* Expression value */ + AST_UnionLabel *ulval; /* Union label */ + AST_Field *ffval; /* Field value */ + AST_Expression::ExprType etval; /* Expression type */ + AST_Argument::Direction dival; /* Argument direction */ + AST_Operation::Flags ofval; /* Operation flags */ + FE_Declarator *deval; /* Declarator value */ + idl_bool bval; /* Boolean value */ + long ival; /* Long value */ + double dval; /* Double value */ + float fval; /* Float value */ + char cval; /* Char value */ - String *sval; /* String value */ - char *strval; /* char * value */ - Identifier *idval; /* Identifier */ - UTL_IdList *idlist; /* Identifier list */ + String *sval; /* String value */ + char *strval; /* char * value */ + Identifier *idval; /* Identifier */ + UTL_IdList *idlist; /* Identifier list */ } TAO_YYSTYPE; extern TAO_YYSTYPE tao_yylval; # define IDENTIFIER 257 diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h index fc05323e075..0f95cb271d0 100644 --- a/TAO/TAO_IDL/include/ast.h +++ b/TAO/TAO_IDL/include/ast.h @@ -78,43 +78,43 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from idl.hh */ -#include "utl_scoped_name.h" // Define UTL_ScopedName - -#include "ast_decl.h" // class AST_Decl - -#include "ast_expression.h" // class AST_Expression - -#include "utl_scope.h" // class UTL_Scope - -#include "ast_type.h" // class AST_Type -#include "ast_concrete_type.h" // class AST_ConcreteType -#include "ast_predefined_type.h"// class AST_PredefinedType -#include "ast_module.h" // class AST_Module -#include "ast_root.h" // class AST_Root -#include "ast_interface.h" // class AST_Interface -#include "ast_interface_fwd.h" // class AST_InterfaceFwd -#include "ast_structure.h" // class AST_Structure -#include "ast_exception.h" // class AST_Exception -#include "ast_enum.h" // class AST_Enum -#include "ast_operation.h" // class AST_Operation -#include "ast_field.h" // class AST_Field -#include "ast_argument.h" // class AST_Argument -#include "ast_attribute.h" // class AST_Attribute -#include "ast_union.h" // class AST_Union -#include "ast_union_branch.h" // class AST_UnionBranch -#include "ast_union_label.h" // class AST_UnionLabel -#include "ast_constant.h" // class AST_Constant -#include "ast_enum_val.h" // class AST_EnumVal -#include "ast_array.h" // class AST_Array -#include "ast_sequence.h" // class AST_Sequence -#include "ast_string.h" // class AST_String -#include "ast_typedef.h" // class AST_Typedef +#include "utl_scoped_name.h" // Define UTL_ScopedName + +#include "ast_decl.h" // class AST_Decl + +#include "ast_expression.h" // class AST_Expression + +#include "utl_scope.h" // class UTL_Scope + +#include "ast_type.h" // class AST_Type +#include "ast_concrete_type.h" // class AST_ConcreteType +#include "ast_predefined_type.h"// class AST_PredefinedType +#include "ast_module.h" // class AST_Module +#include "ast_root.h" // class AST_Root +#include "ast_interface.h" // class AST_Interface +#include "ast_interface_fwd.h" // class AST_InterfaceFwd +#include "ast_structure.h" // class AST_Structure +#include "ast_exception.h" // class AST_Exception +#include "ast_enum.h" // class AST_Enum +#include "ast_operation.h" // class AST_Operation +#include "ast_field.h" // class AST_Field +#include "ast_argument.h" // class AST_Argument +#include "ast_attribute.h" // class AST_Attribute +#include "ast_union.h" // class AST_Union +#include "ast_union_branch.h" // class AST_UnionBranch +#include "ast_union_label.h" // class AST_UnionLabel +#include "ast_constant.h" // class AST_Constant +#include "ast_enum_val.h" // class AST_EnumVal +#include "ast_array.h" // class AST_Array +#include "ast_sequence.h" // class AST_Sequence +#include "ast_string.h" // class AST_String +#include "ast_typedef.h" // class AST_Typedef #include "ast_native.h" // class AST_Native -#include "utl_list.h" // class UTL_List -#include "utl_strlist.h" // class UTL_StrList -#include "utl_exprlist.h" // class UTL_ExprList +#include "utl_list.h" // class UTL_List +#include "utl_strlist.h" // class UTL_StrList +#include "utl_exprlist.h" // class UTL_ExprList -#include "ast_generator.h" // class AST_Generator +#include "ast_generator.h" // class AST_Generator #endif // _AST_AST_HH diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index 1f65d0ca9ac..e2d2663362d 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,14 +73,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_field.hh, utl_scoped_name.hh, ast_type.hh -** utl_strlist.hh, ast_decl.hh +** utl_strlist.hh, ast_decl.hh ** ** USE: Included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "ast_field.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "ast_field.h" class AST_Argument : public virtual AST_Field @@ -94,7 +94,7 @@ public: // Constructor(s) AST_Argument(); AST_Argument(Direction direction, AST_Type *ft, UTL_ScopedName *n, - UTL_StrList *p); + UTL_StrList *p); virtual ~AST_Argument() {} // Data Accessors @@ -105,11 +105,11 @@ public: DEF_NARROW_FROM_DECL(AST_Argument); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - const Direction pd_direction; // Argument direction + const Direction pd_direction; // Argument direction }; #endif // _AST_ARGUMENT_AST_ARGUMENT_HH diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 86d2387000b..a8f0b7a5002 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_concrete_type.hh, utl_exprlist.hh, ast_type.hh, -** ast_decl.hh +** ast_decl.hh ** ** USE: Included from ast.hh */ -class AST_Array : public virtual AST_ConcreteType { +class AST_Array : public virtual AST_ConcreteType { public: // Operations @@ -90,28 +90,28 @@ public: // Data Accessors unsigned long n_dims(); AST_Expression **dims(); - void set_dims(AST_Expression **, unsigned long); - AST_Type *base_type(); - void set_base_type(AST_Type *nbt); + void set_dims(AST_Expression **, unsigned long); + AST_Type *base_type(); + void set_base_type(AST_Type *nbt); // Narrowing DEF_NARROW_METHODS1(AST_Array, AST_ConcreteType); DEF_NARROW_FROM_DECL(AST_Array); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - unsigned long pd_n_dims; // How many dimensions? - AST_Expression **pd_dims; // Their expressions - AST_Type *pd_base_type; // Base type of array + unsigned long pd_n_dims; // How many dimensions? + AST_Expression **pd_dims; // Their expressions + AST_Type *pd_base_type; // Base type of array // Operations // Compute how many dimensions - AST_Expression **compute_dims(UTL_ExprList *dims, - unsigned long ndims); + AST_Expression **compute_dims(UTL_ExprList *dims, + unsigned long ndims); }; #endif // _AST_ARRAY_AST_ARRAY_HH diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index 6abc58967d6..f9f5dd3f7cf 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_field.hh, ast_type.hh, utl_scoped_name.hh, -** utl_strlist.hh, ast_decl.hh +** utl_strlist.hh, ast_decl.hh ** ** USE: Included from ast.h */ -class AST_Attribute : public virtual AST_Field +class AST_Attribute : public virtual AST_Field { public: // Operations @@ -86,9 +86,9 @@ public: // Constructor(s) AST_Attribute(); AST_Attribute(idl_bool readonly, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); virtual ~AST_Attribute() {} // Data Accessors @@ -99,11 +99,11 @@ public: DEF_NARROW_FROM_DECL(AST_Attribute); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - const idl_bool pd_readonly; // Is attribute read-only? + const idl_bool pd_readonly; // Is attribute read-only? }; #endif // _AST_ATTRIBUTE_AST_ATTRIBUTE_HH diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 410c2eabe16..660994ee572 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -class AST_ConcreteType : public virtual AST_Type +class AST_ConcreteType : public virtual AST_Type { public: // Operations diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index 2f663c60a1e..afb73edeb58 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -79,12 +79,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_decl.hh, ast_expression.hh, utl_scoped_name.hh, -** utl_strlist.hh +** utl_strlist.hh ** ** USE: Included from ast.hh */ -class AST_Constant : public virtual AST_Decl +class AST_Constant : public virtual AST_Decl { public: // Operations @@ -92,9 +92,9 @@ public: // Constructor(s) AST_Constant(); AST_Constant(AST_Expression::ExprType et, AST_Decl::NodeType nt, - AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p); + AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p); AST_Constant(AST_Expression::ExprType et, AST_Expression *ev, - UTL_ScopedName *n, UTL_StrList *p); + UTL_ScopedName *n, UTL_StrList *p); virtual ~AST_Constant() {} // Data Accessors @@ -106,12 +106,12 @@ public: DEF_NARROW_FROM_DECL(AST_Constant); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Expression *pd_constant_value; // The value - AST_Expression::ExprType pd_et; // Its expr type + AST_Expression *pd_constant_value; // The value + AST_Expression::ExprType pd_et; // Its expr type }; #endif // _AST_CONSTANT_AST_CONSTANT_HH diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index 1177756ce85..8b7dde9d031 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -80,11 +80,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "idl_bool.h" -#include "utl_scoped_name.h" -#include "utl_string.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "idl_bool.h" +#include "utl_scoped_name.h" +#include "utl_string.h" // This class is needed (only for g++) to get around a bug in g++ which // causes virtual operations to not be looked up correctly if an operation @@ -92,38 +92,38 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // the hierarchy rooted in a single class, thereby eliminating the situation // that causes the bug to appear -class COMMON_Base +class COMMON_Base { public: // Narrowing DEF_NARROW_METHODS0(COMMON_Base); }; -class AST_Decl : public virtual COMMON_Base +class AST_Decl : public virtual COMMON_Base { public: // Enum defining the different kinds of AST nodes enum NodeType { - NT_module // Denotes a module - , NT_root // Denotes the root of AST - , NT_interface // Denotes an interface - , NT_interface_fwd // Fwd declared interface - , NT_const // Denotes a constant - , NT_except // Denotes an exception - , NT_attr // Denotes an attribute - , NT_op // Denotes an operation - , NT_argument // Denotes an op. argument - , NT_union // Denotes a union - , NT_union_branch // Denotes a union branch - , NT_struct // Denotes a structure - , NT_field // Denotes a field in structure - , NT_enum // Denotes an enumeration - , NT_enum_val // Denotes an enum. value - , NT_string // Denotes an IDL string - , NT_array // Denotes an IDL array - , NT_sequence // Denotes an IDL sequence - , NT_typedef // Denotes a typedef - , NT_pre_defined // Denotes a predefined type + NT_module // Denotes a module + , NT_root // Denotes the root of AST + , NT_interface // Denotes an interface + , NT_interface_fwd // Fwd declared interface + , NT_const // Denotes a constant + , NT_except // Denotes an exception + , NT_attr // Denotes an attribute + , NT_op // Denotes an operation + , NT_argument // Denotes an op. argument + , NT_union // Denotes a union + , NT_union_branch // Denotes a union branch + , NT_struct // Denotes a structure + , NT_field // Denotes a field in structure + , NT_enum // Denotes an enumeration + , NT_enum_val // Denotes an enum. value + , NT_string // Denotes an IDL string + , NT_array // Denotes an IDL array + , NT_sequence // Denotes an IDL sequence + , NT_typedef // Denotes a typedef + , NT_pre_defined // Denotes a predefined type , NT_native // Denotes a native type // dependent on the programming // language @@ -161,30 +161,30 @@ public: DEF_NARROW_FROM_DECL(AST_Decl); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); // Other operations // Return TRUE if "this" has "s" as an ancestor - idl_bool has_ancestor(AST_Decl *s); + idl_bool has_ancestor(AST_Decl *s); private: // Data - idl_bool pd_imported; // Imported? - idl_bool pd_in_main_file; // Defined in main file? - UTL_Scope *pd_defined_in; // Scope - NodeType pd_node_type; // What kind of node - long pd_line; // Line defined in - String *pd_file_name; // What file defined in - UTL_ScopedName *pd_name; // As given - Identifier *pd_local_name; // Name in scope - UTL_StrList *pd_pragmas; // Pragmas - idl_bool pd_added; // already added + idl_bool pd_imported; // Imported? + idl_bool pd_in_main_file; // Defined in main file? + UTL_Scope *pd_defined_in; // Scope + NodeType pd_node_type; // What kind of node + long pd_line; // Line defined in + String *pd_file_name; // What file defined in + UTL_ScopedName *pd_name; // As given + Identifier *pd_local_name; // Name in scope + UTL_StrList *pd_pragmas; // Pragmas + idl_bool pd_added; // already added // Operations // Compute the full name of an AST node - void compute_full_name(UTL_ScopedName *n); + void compute_full_name(UTL_ScopedName *n); }; #endif // _AST_DECL_AST_DECL_HH diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index 40189295737..550146537b7 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_enum_val.hh, -** utl_scoped_name.hh, utl_strlist.hh, ast_expression.hh, +** utl_scoped_name.hh, utl_strlist.hh, ast_expression.hh, ** ** USE: Included from ast.hh */ -class AST_Enum : public virtual AST_ConcreteType, public virtual UTL_Scope +class AST_Enum : public virtual AST_ConcreteType, public virtual UTL_Scope { public: // Operations @@ -92,23 +92,23 @@ public: DEF_NARROW_FROM_SCOPE(AST_Enum); // AST Dumping - virtual void dump(ostream &); + virtual void dump(ostream &); // Other operations // Look up an AST_EnumVal by value - virtual AST_EnumVal *lookup_by_value(const AST_Expression *v); + virtual AST_EnumVal *lookup_by_value(const AST_Expression *v); // Get value to be assigned to next enumerator - virtual unsigned long next_enum_val(); + virtual unsigned long next_enum_val(); private: // Data - unsigned long pd_enum_counter; // Value for next - // enumerator + unsigned long pd_enum_counter; // Value for next + // enumerator // Scope management friend int tao_yyparse(); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); }; diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h index 6851474b641..83b5033fcf6 100644 --- a/TAO/TAO_IDL/include/ast_enum_val.h +++ b/TAO/TAO_IDL/include/ast_enum_val.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_constant.hh, utl_scoped_name.hh, utl_strlist.hh, -** ast_decl.hh +** ast_decl.hh ** ** USE: Included from ast.hh */ -class AST_EnumVal : public virtual AST_Constant +class AST_EnumVal : public virtual AST_Constant { public: // Operations @@ -93,7 +93,7 @@ public: DEF_NARROW_FROM_DECL(AST_EnumVal); // AST Dumping - virtual void dump(ostream &); + virtual void dump(ostream &); }; #endif // _AST_ENUM_VAL_AST_ENUM_VAL_HH diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index f3a667bd8b7..e7821e6d405 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -85,7 +85,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -class AST_Exception : public virtual AST_Structure +class AST_Exception : public virtual AST_Structure { public: // Operations @@ -101,17 +101,17 @@ public: DEF_NARROW_FROM_SCOPE(AST_Exception); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: friend int tao_yyparse(); // Scope Management Protocol - virtual AST_Field *fe_add_field(AST_Field *f); - virtual AST_Union *fe_add_union(AST_Union *u); - virtual AST_Structure *fe_add_structure(AST_Structure *s); - virtual AST_Enum *fe_add_enum(AST_Enum *e); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_Field *fe_add_field(AST_Field *f); + virtual AST_Union *fe_add_union(AST_Union *u); + virtual AST_Structure *fe_add_structure(AST_Structure *s); + virtual AST_Enum *fe_add_enum(AST_Enum *e); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); }; diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index db3bd7abc41..5ac661d52df 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -76,70 +76,70 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ // An expression (and maybe its value, if computed) -class AST_Expression { +class AST_Expression { public: // Enum to define all the different operators to combine expressions enum ExprComb { - EC_add // '+' - , EC_minus // '-' - , EC_mul // '*' - , EC_div // '/' - , EC_mod // '%' - , EC_or // '|' - , EC_xor // '^' - , EC_and // '&' - , EC_left // '<<' - , EC_right // '>>' - , EC_u_plus // unary '+' - , EC_u_minus // unary '-' - , EC_bit_neg // '~' - , EC_none // No operator (missing) - , EC_symbol // a symbol (function or constant name) + EC_add // '+' + , EC_minus // '-' + , EC_mul // '*' + , EC_div // '/' + , EC_mod // '%' + , EC_or // '|' + , EC_xor // '^' + , EC_and // '&' + , EC_left // '<<' + , EC_right // '>>' + , EC_u_plus // unary '+' + , EC_u_minus // unary '-' + , EC_bit_neg // '~' + , EC_none // No operator (missing) + , EC_symbol // a symbol (function or constant name) }; - + // Enum to define the different kinds of evaluation possible // Extend this for more kinds of evaluation as required enum EvalKind { - EK_const // Must evaluate to constant - , EK_positive_int // Must evaluate to positive integer + EK_const // Must evaluate to constant + , EK_positive_int // Must evaluate to positive integer }; // Enum to define expression type enum ExprType { - EV_short // Expression value is short - , EV_ushort // Expression value is unsigned short - , EV_long // Expression value is long - , EV_ulong // Expression value is unsigned long - , EV_longlong // Expression value is long long - , EV_ulonglong // Expression value is unsigned long long - , EV_float // Expression value is 32-bit float - , EV_double // Expression value is 64-bit float - , EV_longdouble // Expression value is 128-bit float - , EV_char // Expression value is char - , EV_wchar // Expression value is wide char - , EV_octet // Expression value is unsigned char - , EV_bool // Expression value is boolean - , EV_string // Expression value is char * - , EV_wstring // Expression value is wchar_t * - , EV_any // Expression value is any of above - , EV_void // Expression value is void (absent) - , EV_none // Expression value is missing + EV_short // Expression value is short + , EV_ushort // Expression value is unsigned short + , EV_long // Expression value is long + , EV_ulong // Expression value is unsigned long + , EV_longlong // Expression value is long long + , EV_ulonglong // Expression value is unsigned long long + , EV_float // Expression value is 32-bit float + , EV_double // Expression value is 64-bit float + , EV_longdouble // Expression value is 128-bit float + , EV_char // Expression value is char + , EV_wchar // Expression value is wide char + , EV_octet // Expression value is unsigned char + , EV_bool // Expression value is boolean + , EV_string // Expression value is char * + , EV_wstring // Expression value is wchar_t * + , EV_any // Expression value is any of above + , EV_void // Expression value is void (absent) + , EV_none // Expression value is missing }; // Structure to descrive value of constant expression and its type struct AST_ExprValue { union { - short sval; // Contains short expression value - unsigned short usval; // Contains unsigned short expr value - long lval; // Contains long expression value - unsigned long ulval; // Contains unsigned long expr value - unsigned long bval; // Contains boolean expression value - float fval; // Contains 32-bit float expr value - double dval; // Contains 64-bit float expr value - char cval; // Contains char expression value - unsigned char oval; // Contains unsigned char expr value - String *strval; // Contains String * expr value - unsigned long eval; // Contains enumeration value + short sval; // Contains short expression value + unsigned short usval; // Contains unsigned short expr value + long lval; // Contains long expression value + unsigned long ulval; // Contains unsigned long expr value + unsigned long bval; // Contains boolean expression value + float fval; // Contains 32-bit float expr value + double dval; // Contains 64-bit float expr value + char cval; // Contains char expression value + unsigned char oval; // Contains unsigned char expr value + String *strval; // Contains String * expr value + unsigned long eval; // Contains enumeration value } u; ExprType et; }; @@ -151,17 +151,17 @@ public: AST_Expression(ExprComb c, AST_Expression *v1, AST_Expression *v2); - AST_Expression(short s); - AST_Expression(unsigned short us); - AST_Expression(long l); - AST_Expression(long l, ExprType t); - AST_Expression(unsigned long ul); - AST_Expression(float f); - AST_Expression(double d); - AST_Expression(char c); - AST_Expression(unsigned char uc); - AST_Expression(String *s); - AST_Expression(UTL_ScopedName *n); + AST_Expression(short s); + AST_Expression(unsigned short us); + AST_Expression(long l); + AST_Expression(long l, ExprType t); + AST_Expression(unsigned long ul); + AST_Expression(float f); + AST_Expression(double d); + AST_Expression(char c); + AST_Expression(unsigned char uc); + AST_Expression(String *s); + AST_Expression(UTL_ScopedName *n); virtual ~AST_Expression () {} // Data Accessors @@ -173,7 +173,7 @@ public: void set_file_name(String *f); ExprComb ec(); void set_ec(ExprComb new_ec); - AST_ExprValue *ev(); + AST_ExprValue *ev(); void set_ev(AST_ExprValue *new_ev); AST_Expression *v1(); void set_v1(AST_Expression *e); @@ -183,44 +183,44 @@ public: void set_n(UTL_ScopedName *new_n); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); // Other operations // Evaluation and value coercion - virtual AST_ExprValue *eval(EvalKind ek); - virtual AST_ExprValue *coerce(ExprType t); + virtual AST_ExprValue *eval(EvalKind ek); + virtual AST_ExprValue *coerce(ExprType t); // Evaluate then store value inside this AST_Expression - virtual void evaluate(EvalKind ek); + virtual void evaluate(EvalKind ek); // Compare to AST_Expressions - virtual long operator==(AST_Expression *vc); - virtual long compare(AST_Expression *vc); + virtual long operator==(AST_Expression *vc); + virtual long compare(AST_Expression *vc); protected: // Evaluate different sets of operators - virtual AST_ExprValue *eval_bin_op(EvalKind ek); - virtual AST_ExprValue *eval_bit_op(EvalKind ek); - virtual AST_ExprValue *eval_un_op(EvalKind ek); - virtual AST_ExprValue *eval_symbol(EvalKind ek); + virtual AST_ExprValue *eval_bin_op(EvalKind ek); + virtual AST_ExprValue *eval_bit_op(EvalKind ek); + virtual AST_ExprValue *eval_un_op(EvalKind ek); + virtual AST_ExprValue *eval_symbol(EvalKind ek); private: // Data - UTL_Scope *pd_defined_in; // Scope - long pd_line; // Line defined in - String *pd_file_name; // What file defined in + UTL_Scope *pd_defined_in; // Scope + long pd_line; // Line defined in + String *pd_file_name; // What file defined in - ExprComb pd_ec; // What combinator - AST_ExprValue *pd_ev; // computed value - AST_Expression *pd_v1; // 1st sub-expression - AST_Expression *pd_v2; // 2nd sub-expression - UTL_ScopedName *pd_n; // symbolic name (if any) + ExprComb pd_ec; // What combinator + AST_ExprValue *pd_ev; // computed value + AST_Expression *pd_v1; // 1st sub-expression + AST_Expression *pd_v2; // 2nd sub-expression + UTL_ScopedName *pd_n; // symbolic name (if any) // Operations // Fill out the lineno, filename and definition scope details - void fill_definition_details(); + void fill_definition_details(); // Internal evaluation virtual AST_ExprValue *eval_internal(EvalKind ek); diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index f344e371b83..493a12eaa0b 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -84,10 +84,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // the entire AST. The check ensures that for each fwd declared interface // the full definition was also seen. -extern void AST_record_fwd_interface(AST_InterfaceFwd *i); -extern void AST_check_fwd_interface(); +extern void AST_record_fwd_interface(AST_InterfaceFwd *i); +extern void AST_check_fwd_interface(); -extern idl_bool AST_illegal_recursive_type(AST_Decl *t); +extern idl_bool AST_illegal_recursive_type(AST_Decl *t); #endif // _AST_EXTERN_AST_EXTERN_HH diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index b3c6f04cd8c..20df9f68fe3 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -82,12 +82,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "ast_decl.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "ast_decl.h" -class AST_Field : public virtual AST_Decl +class AST_Field : public virtual AST_Decl { public: // Operations @@ -95,9 +95,9 @@ public: // Constructor(s) AST_Field(); AST_Field(AST_Type *field_type, - UTL_ScopedName *n, UTL_StrList *p); + UTL_ScopedName *n, UTL_StrList *p); AST_Field(AST_Decl::NodeType nt, AST_Type *field_type, - UTL_ScopedName *n, UTL_StrList *p); + UTL_ScopedName *n, UTL_StrList *p); virtual ~AST_Field() {} // Data Accessors @@ -108,11 +108,11 @@ public: DEF_NARROW_FROM_DECL(AST_Field); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Type *pd_field_type; // Base type for field + AST_Type *pd_field_type; // Base type for field }; diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index 6733bbad3e8..b6a6686ffb8 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -73,18 +73,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_predefined_type.hh utl_scoped_name.hh utl_strlist.hh -** ast_module.hh ast_root.hh ast_interface.hh -** ast_interface_fwd.hh ast_exception.hh ast_structure.hh -** ast_enum.hh ast_operation.hh ast_type.hh ast_field.hh -** ast_argument.hh ast_attribute.hh ast_union.hh -** ast_concrete_type.hh ast_union_branch.hh ast_union_label.hh -** ast_expression.hh ast_enum_val.hh ast_array.hh -** ast_sequence.hh ast_string.hh ast_typedef.hh +** ast_module.hh ast_root.hh ast_interface.hh +** ast_interface_fwd.hh ast_exception.hh ast_structure.hh +** ast_enum.hh ast_operation.hh ast_type.hh ast_field.hh +** ast_argument.hh ast_attribute.hh ast_union.hh +** ast_concrete_type.hh ast_union_branch.hh ast_union_label.hh +** ast_expression.hh ast_enum_val.hh ast_array.hh +** ast_sequence.hh ast_string.hh ast_typedef.hh ** ** USE: Included from ast.hh */ -class AST_Generator +class AST_Generator { public: // Operations @@ -92,126 +92,126 @@ public: // Create a node representing a predefined type virtual AST_PredefinedType *create_predefined_type(AST_PredefinedType::PredefinedType t, - UTL_ScopedName *n, - UTL_StrList *p); + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a module - virtual AST_Module *create_module(UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Module *create_module(UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a module which is the root of an AST - virtual AST_Root *create_root(UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Root *create_root(UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing an interface - virtual AST_Interface *create_interface(UTL_ScopedName *n, - AST_Interface **ih, - long nih, - UTL_StrList *p); + virtual AST_Interface *create_interface(UTL_ScopedName *n, + AST_Interface **ih, + long nih, + UTL_StrList *p); // Create a node representing a forward declaration of an interface virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n, - UTL_StrList *p); + UTL_StrList *p); // Create a node representing an exception - virtual AST_Exception *create_exception(UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Exception *create_exception(UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a structure - virtual AST_Structure *create_structure(UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Structure *create_structure(UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing an enum - virtual AST_Enum *create_enum(UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Enum *create_enum(UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing an operation on an interface - virtual AST_Operation *create_operation(AST_Type *rt, - AST_Operation::Flags fl, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Operation *create_operation(AST_Type *rt, + AST_Operation::Flags fl, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a field in a structure, exception or // union - virtual AST_Field *create_field(AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Field *create_field(AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing an argument to an operation - virtual AST_Argument *create_argument(AST_Argument::Direction d, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Argument *create_argument(AST_Argument::Direction d, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing an attribute - virtual AST_Attribute *create_attribute(idl_bool ro, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Attribute *create_attribute(idl_bool ro, + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a union - virtual AST_Union *create_union(AST_ConcreteType *dt, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Union *create_union(AST_ConcreteType *dt, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing one branch in a union virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a label on a union branch virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul, - AST_Expression *lv); + AST_Expression *lv); // Create a node representing a constant - virtual AST_Constant *create_constant(AST_Expression::ExprType et, - AST_Expression *ev, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Constant *create_constant(AST_Expression::ExprType et, + AST_Expression *ev, + UTL_ScopedName *n, + UTL_StrList *p); // Create various kinds of nodes representing expressions - virtual AST_Expression *create_expr(UTL_ScopedName *n); - virtual AST_Expression *create_expr(AST_Expression *v, - AST_Expression::ExprType t); - virtual AST_Expression *create_expr(AST_Expression::ExprComb c, - AST_Expression *v1, - AST_Expression *v2); - virtual AST_Expression *create_expr(long v); - virtual AST_Expression *create_expr(long v, - AST_Expression::ExprType t); - virtual AST_Expression *create_expr(unsigned long v); - virtual AST_Expression *create_expr(String *s); - virtual AST_Expression *create_expr(char c); - virtual AST_Expression *create_expr(double d); + virtual AST_Expression *create_expr(UTL_ScopedName *n); + virtual AST_Expression *create_expr(AST_Expression *v, + AST_Expression::ExprType t); + virtual AST_Expression *create_expr(AST_Expression::ExprComb c, + AST_Expression *v1, + AST_Expression *v2); + virtual AST_Expression *create_expr(long v); + virtual AST_Expression *create_expr(long v, + AST_Expression::ExprType t); + virtual AST_Expression *create_expr(unsigned long v); + virtual AST_Expression *create_expr(String *s); + virtual AST_Expression *create_expr(char c); + virtual AST_Expression *create_expr(double d); // Create a node representing an enumerator - virtual AST_EnumVal *create_enum_val(unsigned long v, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_EnumVal *create_enum_val(unsigned long v, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing an array type - virtual AST_Array *create_array(UTL_ScopedName *n, - unsigned long ndims, - UTL_ExprList *dims); + virtual AST_Array *create_array(UTL_ScopedName *n, + unsigned long ndims, + UTL_ExprList *dims); // Create a node representing a sequence type - virtual AST_Sequence *create_sequence(AST_Expression *v, - AST_Type *bt); + virtual AST_Sequence *create_sequence(AST_Expression *v, + AST_Type *bt); // Create a node representing a string type - virtual AST_String *create_string(AST_Expression *v); + virtual AST_String *create_string(AST_Expression *v); // Create a node representing a wide string type - virtual AST_String *create_wstring(AST_Expression *v); + virtual AST_String *create_wstring(AST_Expression *v); // Create a node representing a type renaming (typedef) - virtual AST_Typedef *create_typedef(AST_Type *bt, - UTL_ScopedName *n, - UTL_StrList *p); + virtual AST_Typedef *create_typedef(AST_Type *bt, + UTL_ScopedName *n, + UTL_StrList *p); // Create a node representing a native - virtual AST_Native *create_native (UTL_ScopedName *n, + virtual AST_Native *create_native (UTL_ScopedName *n, UTL_StrList *p); }; diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index c41eaf858fd..317a181dcd0 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -79,14 +79,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "ast_type.h" -#include "utl_scope.h" -#include "ast_decl.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "ast_type.h" +#include "utl_scope.h" +#include "ast_decl.h" -class AST_Interface : public virtual AST_Type, public virtual UTL_Scope +class AST_Interface : public virtual AST_Type, public virtual UTL_Scope { public: // Operations @@ -94,13 +94,13 @@ public: // Constructor(s) AST_Interface(); AST_Interface(UTL_ScopedName *n, - AST_Interface **ih, - long nih, - UTL_StrList *p); + AST_Interface **ih, + long nih, + UTL_StrList *p); virtual ~AST_Interface() {} // Data Accessors - AST_Interface **inherits(); + AST_Interface **inherits(); void set_inherits(AST_Interface **i); long n_inherits(); void set_n_inherits(long i); @@ -119,27 +119,27 @@ public: DEF_NARROW_FROM_SCOPE(AST_Interface); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Interface **pd_inherits; // Inherited interfaces - // This is an array of pointers - // to the inherited interfaces - long pd_n_inherits; // How many of them? + AST_Interface **pd_inherits; // Inherited interfaces + // This is an array of pointers + // to the inherited interfaces + long pd_n_inherits; // How many of them? // Scope Management Protocol friend int tao_yyparse(); - virtual AST_Constant *fe_add_constant(AST_Constant *c); - virtual AST_Exception *fe_add_exception(AST_Exception *e); - virtual AST_Attribute *fe_add_attribute(AST_Attribute *a); - virtual AST_Operation *fe_add_operation(AST_Operation *o); - virtual AST_Union *fe_add_union(AST_Union *u); - virtual AST_Structure *fe_add_structure(AST_Structure *s); - virtual AST_Enum *fe_add_enum(AST_Enum *e); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); - virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); + virtual AST_Constant *fe_add_constant(AST_Constant *c); + virtual AST_Exception *fe_add_exception(AST_Exception *e); + virtual AST_Attribute *fe_add_attribute(AST_Attribute *a); + virtual AST_Operation *fe_add_operation(AST_Operation *o); + virtual AST_Union *fe_add_union(AST_Union *u); + virtual AST_Structure *fe_add_structure(AST_Structure *s); + virtual AST_Enum *fe_add_enum(AST_Enum *e); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); virtual AST_Native *fe_add_native (AST_Native *n); }; diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index 72a8f8842aa..49153b9da59 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_decl.hh, ast_interface.hh, utl_scoped_name.hh, -** utl_strlist.hh +** utl_strlist.hh ** ** USE: Included from ast.hh */ -class AST_InterfaceFwd : public virtual AST_Type +class AST_InterfaceFwd : public virtual AST_Type { public: // Operations @@ -87,7 +87,7 @@ public: virtual ~AST_InterfaceFwd() {} // Data Accessors - AST_Interface *full_definition(); + AST_Interface *full_definition(); void set_full_definition(AST_Interface *nfd); // Narrowing @@ -95,12 +95,12 @@ public: DEF_NARROW_FROM_DECL(AST_InterfaceFwd); // AST Dumping - virtual void dump(ostream &); + virtual void dump(ostream &); private: // Data - AST_Interface *pd_full_definition; // The interface this is a - // forward declaration of + AST_Interface *pd_full_definition; // The interface this is a + // forward declaration of }; #endif // _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 073eb5baa2c..cae2cb03b3c 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -79,7 +79,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -class AST_Module : public virtual AST_Decl, public virtual UTL_Scope +class AST_Module : public virtual AST_Decl, public virtual UTL_Scope { public: // Operations @@ -95,7 +95,7 @@ public: DEF_NARROW_FROM_SCOPE(AST_Module); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: friend void fe_populate(AST_Module *m); @@ -103,17 +103,17 @@ private: // Scope Management Protocol - virtual AST_PredefinedType *fe_add_predefined_type(AST_PredefinedType *t); - virtual AST_Module *fe_add_module(AST_Module *m); - virtual AST_Interface *fe_add_interface(AST_Interface *i); - virtual AST_InterfaceFwd *fe_add_interface_fwd(AST_InterfaceFwd *i); - virtual AST_Constant *fe_add_constant(AST_Constant *c); - virtual AST_Exception *fe_add_exception(AST_Exception *e); - virtual AST_Union *fe_add_union(AST_Union *u); - virtual AST_Structure *fe_add_structure(AST_Structure *s); - virtual AST_Enum *fe_add_enum(AST_Enum *e); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); - virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); + virtual AST_PredefinedType *fe_add_predefined_type(AST_PredefinedType *t); + virtual AST_Module *fe_add_module(AST_Module *m); + virtual AST_Interface *fe_add_interface(AST_Interface *i); + virtual AST_InterfaceFwd *fe_add_interface_fwd(AST_InterfaceFwd *i); + virtual AST_Constant *fe_add_constant(AST_Constant *c); + virtual AST_Exception *fe_add_exception(AST_Exception *e); + virtual AST_Union *fe_add_union(AST_Union *u); + virtual AST_Structure *fe_add_structure(AST_Structure *s); + virtual AST_Enum *fe_add_enum(AST_Enum *e); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); virtual AST_Native *fe_add_native (AST_Native *n); }; diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index d170da542a9..4b3f40fa6b9 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#if !defined (_AST_NATIVE_H_) +#ifndef _AST_NATIVE_H_ #define _AST_NATIVE_H_ // Representation of "native" IDL type added by the POA spec @@ -32,7 +32,7 @@ public: DEF_NARROW_FROM_DECL(AST_Native); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); }; #endif /* AST_NATIVE_H */ diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index 3dcf8a252ef..50ef6b40796 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -71,27 +71,27 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_decl.hh, utl_scope.hh, ast_type.hh, utl_strlist.hh, -** utl_exceptlist.hh, utl_scoped_name.hh +** utl_exceptlist.hh, utl_scoped_name.hh ** ** USE: included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "utl_list.h" -#include "ast_decl.h" -#include "utl_scope.h" -#include "utl_scoped_name.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "utl_list.h" +#include "ast_decl.h" +#include "utl_scope.h" +#include "utl_scoped_name.h" -class AST_Operation : public virtual AST_Decl, public virtual UTL_Scope +class AST_Operation : public virtual AST_Decl, public virtual UTL_Scope { public: // Define enum with flags for operation attributes enum Flags { - OP_noflags // No flags present - , OP_oneway // Operation is oneway - , OP_idempotent // Operation is idempotent + OP_noflags // No flags present + , OP_oneway // Operation is oneway + , OP_idempotent // Operation is idempotent }; // Operations @@ -99,9 +99,9 @@ public: // Constructor(s) AST_Operation(); AST_Operation(AST_Type *return_type, - Flags flags, - UTL_ScopedName *n, - UTL_StrList *p); + Flags flags, + UTL_ScopedName *n, + UTL_StrList *p); virtual ~AST_Operation() {} // Data Accessors @@ -109,30 +109,30 @@ public: Flags flags(); UTL_StrList *context(); UTL_ExceptList *exceptions(); - + // Narrowing DEF_NARROW_METHODS2(AST_Operation, AST_Decl, UTL_Scope); DEF_NARROW_FROM_DECL(AST_Operation); DEF_NARROW_FROM_SCOPE(AST_Operation); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Type *pd_return_type; // Return type - Flags pd_flags; // Operation flags - UTL_StrList *pd_context; // Context - UTL_ExceptList *pd_exceptions; // Exceptions raised + AST_Type *pd_return_type; // Return type + Flags pd_flags; // Operation flags + UTL_StrList *pd_context; // Context + UTL_ExceptList *pd_exceptions; // Exceptions raised // Scope Management Protocol friend int tao_yyparse(); - virtual AST_Argument *fe_add_argument(AST_Argument *a); - virtual UTL_StrList *fe_add_context(UTL_StrList *c); - // Add context - virtual UTL_NameList *fe_add_exceptions(UTL_NameList *e); - // exceptions + virtual AST_Argument *fe_add_argument(AST_Argument *a); + virtual UTL_StrList *fe_add_context(UTL_StrList *c); + // Add context + virtual UTL_NameList *fe_add_exceptions(UTL_NameList *e); + // exceptions }; diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 7c7ebd953f4..ae4460ac8af 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -74,32 +74,32 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_concrete_type.hh, utl_scoped_name.hh, utl_strlist.hh, -** ast_decl.hh +** ast_decl.hh ** ** USE: Included from ast.hh */ -class AST_PredefinedType : public virtual AST_ConcreteType +class AST_PredefinedType : public virtual AST_ConcreteType { public: // Enum for all the different predefined types enum PredefinedType { - PT_long // Predefined type "long" - , PT_ulong // Predefined type "unsigned long" - , PT_longlong // Predefined type "long long" - , PT_ulonglong // Predefined type "unsigned long long" - , PT_short // Predefined type "short" - , PT_ushort // Predefined type "unsigned short" - , PT_float // Predefined type "float" - , PT_double // Predefined type "double" - , PT_longdouble // Predefined type "long double" - , PT_char // Predefined type "char" - , PT_wchar // Predefined type "wchar_t" - , PT_boolean // Predefined type "boolean" - , PT_octet // Predefined type "octet" - , PT_any // Predefined type "any" - , PT_void // Predefined type "void" - , PT_pseudo // Predefined type for pseudo objects + PT_long // Predefined type "long" + , PT_ulong // Predefined type "unsigned long" + , PT_longlong // Predefined type "long long" + , PT_ulonglong // Predefined type "unsigned long long" + , PT_short // Predefined type "short" + , PT_ushort // Predefined type "unsigned short" + , PT_float // Predefined type "float" + , PT_double // Predefined type "double" + , PT_longdouble // Predefined type "long double" + , PT_char // Predefined type "char" + , PT_wchar // Predefined type "wchar_t" + , PT_boolean // Predefined type "boolean" + , PT_octet // Predefined type "octet" + , PT_any // Predefined type "any" + , PT_void // Predefined type "void" + , PT_pseudo // Predefined type for pseudo objects }; // Operations @@ -110,18 +110,18 @@ public: virtual ~AST_PredefinedType() {} // Data Accessors - PredefinedType pt(); + PredefinedType pt(); // Narrowing DEF_NARROW_METHODS1(AST_PredefinedType, AST_ConcreteType); DEF_NARROW_FROM_DECL(AST_PredefinedType); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - const PredefinedType pd_pt; // The specific predefined type -}; + const PredefinedType pd_pt; // The specific predefined type +}; #endif // _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h index e81c87f1fda..f85e5f9cbb3 100644 --- a/TAO/TAO_IDL/include/ast_root.h +++ b/TAO/TAO_IDL/include/ast_root.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -75,7 +75,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -class AST_Root : public virtual AST_Module +class AST_Root : public virtual AST_Module { public: // Operations @@ -91,16 +91,16 @@ public: DEF_NARROW_FROM_SCOPE(AST_Root); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: friend class FE_Declarator; friend int tao_yyparse(); // Add protocol - virtual AST_Sequence *fe_add_sequence(AST_Sequence *s); - virtual AST_String *fe_add_string(AST_String *s); - virtual AST_Array *fe_add_array(AST_Array *a); + virtual AST_Sequence *fe_add_sequence(AST_Sequence *s); + virtual AST_String *fe_add_string(AST_String *s); + virtual AST_Array *fe_add_array(AST_Array *a); }; diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index 73849d0f02b..38c869792af 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_concrete_type.hh, ast_type.hh, ast_decl.hh, -** ast_expression.hh +** ast_expression.hh ** ** USE: Included from ast.hh */ -class AST_Sequence : public virtual AST_ConcreteType +class AST_Sequence : public virtual AST_ConcreteType { public: // Operations @@ -97,12 +97,12 @@ public: DEF_NARROW_FROM_DECL(AST_Sequence); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Expression *pd_max_size; // Maximum sequence size - AST_Type *pd_base_type; // Sequence base type + AST_Expression *pd_max_size; // Maximum sequence size + AST_Type *pd_base_type; // Sequence base type }; #endif // _AST_SEQUENCE_AST_SEQUENCE_HH diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h index 9e5874c304c..b44577b975d 100644 --- a/TAO/TAO_IDL/include/ast_string.h +++ b/TAO/TAO_IDL/include/ast_string.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -class AST_String : public virtual AST_ConcreteType +class AST_String : public virtual AST_ConcreteType { public: // Operations @@ -90,19 +90,19 @@ public: // Data Accessors AST_Expression *max_size(); - long width(); + long width(); // Narrowing DEF_NARROW_METHODS1(AST_String, AST_ConcreteType); DEF_NARROW_FROM_DECL(AST_String); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Expression *pd_max_size; // String maximum size - long pd_width; // Width of string + AST_Expression *pd_max_size; // String maximum size + long pd_width; // Width of string }; #endif // _AST_STRING_AST_STRING_HH diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index baa1944bbe6..b0f14cc45fe 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -79,13 +79,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, utl_scoped_name.hh, -** utl_strlist.hh +** utl_strlist.hh ** ** USE: Included from ast.hh */ -class AST_Structure : public virtual AST_ConcreteType, - public virtual UTL_Scope +class AST_Structure : public virtual AST_ConcreteType, + public virtual UTL_Scope { public: // Operations @@ -102,17 +102,17 @@ public: DEF_NARROW_FROM_SCOPE(AST_Structure); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: friend int tao_yyparse(); // Scope Management Protocol - virtual AST_Union *fe_add_union(AST_Union *u); - virtual AST_Structure *fe_add_structure(AST_Structure *s); - virtual AST_Field *fe_add_field(AST_Field *f); - virtual AST_Enum *fe_add_enum(AST_Enum *e); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_Union *fe_add_union(AST_Union *u); + virtual AST_Structure *fe_add_structure(AST_Structure *s); + virtual AST_Field *fe_add_field(AST_Field *f); + virtual AST_Enum *fe_add_enum(AST_Enum *e); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); }; #endif // _AST_STRUCTURE_AST_STRUCTURE_HH diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 04a36d8235d..1b22dc98da5 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -78,12 +78,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "ast_decl.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "ast_decl.h" -class AST_Type : public virtual AST_Decl +class AST_Type : public virtual AST_Decl { public: // Operations diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h index c2e13051b54..623c023b84a 100644 --- a/TAO/TAO_IDL/include/ast_typedef.h +++ b/TAO/TAO_IDL/include/ast_typedef.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -77,7 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -class AST_Typedef : public virtual AST_Type +class AST_Typedef : public virtual AST_Type { public: // Operations @@ -95,11 +95,11 @@ public: DEF_NARROW_FROM_DECL(AST_Typedef); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_Type *pd_base_type; // typedef base type + AST_Type *pd_base_type; // typedef base type }; #endif // _AST_TYPEDEF_AST_TYPEDEF_HH diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index 062e540e9a8..84f73d481d5 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -79,12 +79,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_union_branch.hh, -** ast_union_label.hh, utl_scoped_name.hh, utl_strlist.hh +** ast_union_label.hh, utl_scoped_name.hh, utl_strlist.hh ** ** USE: Included from ast.hh */ -class AST_Union : public virtual AST_Structure +class AST_Union : public virtual AST_Structure { public: // Operations @@ -104,39 +104,39 @@ public: DEF_NARROW_FROM_SCOPE(AST_Union); // AST Dumping - virtual void dump(ostream &); + virtual void dump(ostream &); private: // Data - AST_ConcreteType *pd_disc_type; // Discriminator type - AST_Expression::ExprType pd_udisc_type; // Its expression type + AST_ConcreteType *pd_disc_type; // Discriminator type + AST_Expression::ExprType pd_udisc_type; // Its expression type /* Convention: udisc_type == EV_any denotes an enum value */ // Operations // Look up a branch by node pointer - AST_UnionBranch *lookup_branch(AST_UnionBranch *branch); + AST_UnionBranch *lookup_branch(AST_UnionBranch *branch); // Look up the branch with the "default" label - AST_UnionBranch *lookup_default(); + AST_UnionBranch *lookup_default(); // Look up a branch given a branch with a label. This is used to // check for duplicate labels - AST_UnionBranch *lookup_label(AST_UnionBranch *b); + AST_UnionBranch *lookup_label(AST_UnionBranch *b); // Look up a union branch given an enumerator. This is used to // check for duplicate enum labels - AST_UnionBranch *lookup_enum(AST_UnionBranch *b); + AST_UnionBranch *lookup_enum(AST_UnionBranch *b); private: friend int tao_yyparse(); // Scope Management Protocol - virtual AST_Union *fe_add_union(AST_Union *u); - virtual AST_UnionBranch *fe_add_union_branch(AST_UnionBranch *b); - virtual AST_Structure *fe_add_structure(AST_Structure *s); - virtual AST_Enum *fe_add_enum(AST_Enum *e); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_Union *fe_add_union(AST_Union *u); + virtual AST_UnionBranch *fe_add_union_branch(AST_UnionBranch *b); + virtual AST_Structure *fe_add_structure(AST_Structure *s); + virtual AST_Enum *fe_add_enum(AST_Enum *e); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); }; diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index 2bfe414452e..e756a23e383 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPEndencies: ast_field.hh, ast_union_label.hh, ast_type.hh, -** utl_scoped_name.hh, utl_strlist.h, ast_decl.h +** utl_scoped_name.hh, utl_strlist.h, ast_decl.h ** ** USE: Included from ast.hh */ -class AST_UnionBranch : public virtual AST_Field +class AST_UnionBranch : public virtual AST_Field { public: // Operations @@ -86,9 +86,9 @@ public: // Constructor(s) AST_UnionBranch(); AST_UnionBranch(AST_UnionLabel *label, - AST_Type *ft, - UTL_ScopedName *n, - UTL_StrList *p); + AST_Type *ft, + UTL_ScopedName *n, + UTL_StrList *p); virtual ~AST_UnionBranch() {} // Data Accessors @@ -99,11 +99,11 @@ public: DEF_NARROW_FROM_DECL(AST_UnionBranch); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - AST_UnionLabel *pd_label; // Label of this branch + AST_UnionLabel *pd_label; // Label of this branch }; #endif // _AST_UNION_BRANCH_AST_UNION_BRAN_HH diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index 7dd124784a4..2a50603fcbf 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -77,13 +77,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: included from ast.hh */ -class AST_UnionLabel +class AST_UnionLabel { public: // Define kind of label enum UnionLabel { - UL_default // Label is "default" - , UL_label // Regular label + UL_default // Label is "default" + , UL_label // Regular label }; // Operations @@ -98,12 +98,12 @@ public: AST_Expression *label_val(); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); private: // Data - UnionLabel pd_label_kind; // Label kind - AST_Expression *pd_label_val; // Label expression + UnionLabel pd_label_kind; // Label kind + AST_Expression *pd_label_val; // Label expression }; diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h index 253599b76f1..ad43829cf88 100644 --- a/TAO/TAO_IDL/include/be_extern.h +++ b/TAO/TAO_IDL/include/be_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Functions: -extern "C" AST_Generator *BE_init(); +extern "C" AST_Generator *BE_init(); -extern "C" void BE_produce(); -extern "C" void BE_abort(); -extern "C" void BE_prep_arg(char *, idl_bool); +extern "C" void BE_produce(); +extern "C" void BE_abort(); +extern "C" void BE_prep_arg(char *, idl_bool); -extern "C" void BE_version(); +extern "C" void BE_version(); #endif // _BE_EXTERN_BE_EXTERN_HH diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h index b5c3bb163d5..75e69a69546 100644 --- a/TAO/TAO_IDL/include/drv_extern.h +++ b/TAO/TAO_IDL/include/drv_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -71,17 +71,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Functions -extern void DRV_init (); -extern void DRV_parse_args (long, char **); -extern void DRV_usage (); +extern void DRV_init (); +extern void DRV_parse_args (long, char **); +extern void DRV_usage (); -extern void DRV_pre_proc (char *myfile); +extern void DRV_pre_proc (char *myfile); -extern void DRV_cpp_init (); -extern void DRV_cpp_putarg (char *str); -extern void DRV_cpp_new_location (char *new_loc); +extern void DRV_cpp_init (); +extern void DRV_cpp_putarg (char *str); +extern void DRV_cpp_new_location (char *new_loc); -extern void DRV_fork(); +extern void DRV_fork(); extern int DRV_check_gperf (); extern void DRV_check_for_include (const char* buf); #endif // _DRV_EXTERN_DRV_EXTERN_HH diff --git a/TAO/TAO_IDL/include/drv_link.h b/TAO/TAO_IDL/include/drv_link.h index fa154436c25..0eaec30233c 100644 --- a/TAO/TAO_IDL/include/drv_link.h +++ b/TAO/TAO_IDL/include/drv_link.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -67,8 +67,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #ifndef _DRV_LINK_DRV_LINK_HH #define _DRV_LINK_DRV_LINK_HH -// drv_link.hh - Define data and functions which are used to -// link in the back end functions +// drv_link.hh - Define data and functions which are used to +// link in the back end functions /* * Front end interface @@ -87,16 +87,16 @@ typedef UTL_Error * (* DRV_PF_FE_new_UTL_Error)(); typedef UTL_Indenter * (* DRV_PF_FE_new_UTL_Indenter)(); typedef UTL_String * (* DRV_PF_FE_new_UTL_String)(char *); -extern DRV_PF_FE_init_stage1 DRV_FE_init_stage1; -extern DRV_PF_FE_init_stage2 DRV_FE_init_stage2; -extern DRV_PF_FE_yyparse DRV_FE_yyparse; -extern DRV_PF_FE_set_yyin DRV_FE_set_yyin; +extern DRV_PF_FE_init_stage1 DRV_FE_init_stage1; +extern DRV_PF_FE_init_stage2 DRV_FE_init_stage2; +extern DRV_PF_FE_yyparse DRV_FE_yyparse; +extern DRV_PF_FE_set_yyin DRV_FE_set_yyin; -extern DRV_PF_FE_new_UTL_Error DRV_FE_new_UTL_Error; +extern DRV_PF_FE_new_UTL_Error DRV_FE_new_UTL_Error; extern DRV_PF_FE_new_UTL_Indenter DRV_FE_new_UTL_Indenter; -extern DRV_PF_FE_new_UTL_String DRV_FE_new_UTL_String; +extern DRV_PF_FE_new_UTL_String DRV_FE_new_UTL_String; -/* +/* * Back end interface */ @@ -107,11 +107,11 @@ typedef void (* DRV_PF_BE_abort)(); typedef void (* DRV_PF_BE_prep_arg)(char *, idl_bool); typedef void (* DRV_PF_BE_version)(); -extern DRV_PF_BE_init DRV_BE_init; -extern DRV_PF_BE_produce DRV_BE_produce; -extern DRV_PF_BE_abort DRV_BE_abort; -extern DRV_PF_BE_prep_arg DRV_BE_prep_arg; -extern DRV_PF_BE_version DRV_BE_version; +extern DRV_PF_BE_init DRV_BE_init; +extern DRV_PF_BE_produce DRV_BE_produce; +extern DRV_PF_BE_abort DRV_BE_abort; +extern DRV_PF_BE_prep_arg DRV_BE_prep_arg; +extern DRV_PF_BE_version DRV_BE_version; // Functions @@ -121,4 +121,4 @@ extern void DRV_FE_close(); extern void DRV_BE_open(); extern void DRV_BE_close(); -#endif // _DRV_LINK_DRV_LINK_HH +#endif // _DRV_LINK_DRV_LINK_HH diff --git a/TAO/TAO_IDL/include/drv_private.h b/TAO/TAO_IDL/include/drv_private.h index 6b18ea8df74..04ea84024d3 100644 --- a/TAO/TAO_IDL/include/drv_private.h +++ b/TAO/TAO_IDL/include/drv_private.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -68,16 +68,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _DRV_PRIVATE_DRV_PRIVATE_HH // drv_private.hh - Define data and functions which are private to -// the DRV but which must be accessible througout the DRV +// the DRV but which must be accessible througout the DRV // Data -extern char *DRV_files[]; // All files to be processed -extern long DRV_nfiles; // How many are there? -extern long DRV_file_index; // What's the file I am responsible - // for? +extern char *DRV_files[]; // All files to be processed +extern long DRV_nfiles; // How many are there? +extern long DRV_file_index; // What's the file I am responsible + // for? // Functions -extern void DRV_drive(char *);// Compiler driver for single file +extern void DRV_drive(char *);// Compiler driver for single file -#endif // _DRV_PRIVATE_DRV_PRIVATE_HH +#endif // _DRV_PRIVATE_DRV_PRIVATE_HH diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h index 00840836a90..39ea7e7e985 100644 --- a/TAO/TAO_IDL/include/fe_declarator.h +++ b/TAO/TAO_IDL/include/fe_declarator.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -77,13 +77,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from fe.hh */ -class FE_Declarator +class FE_Declarator { public: // Enum to denote types of declarators enum DeclaratorType { - FD_simple // Simple declarator - , FD_complex // Complex declarator (complex_part field used) + FD_simple // Simple declarator + , FD_complex // Complex declarator (complex_part field used) }; // Operations @@ -101,13 +101,13 @@ public: // Compose an FE_Declarator into an AST_Type once all the needed information // is available - AST_Type *compose(AST_Decl* tc); + AST_Type *compose(AST_Decl* tc); private: // Data - AST_Decl *pd_complex_part; // If a complex declarator - UTL_ScopedName *pd_name; // The name if complex - DeclaratorType pd_decl_type; // Whether complex or simple + AST_Decl *pd_complex_part; // If a complex declarator + UTL_ScopedName *pd_name; // The name if complex + DeclaratorType pd_decl_type; // Whether complex or simple }; #endif // _FE_DECLARATOR_FE_DECLARATOR_HH diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h index 87ec38c5b55..d7a7bf6dd03 100644 --- a/TAO/TAO_IDL/include/fe_extern.h +++ b/TAO/TAO_IDL/include/fe_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -87,14 +87,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // which is then used in the second stage to create the global scope // and to populate it with nodes for the predefined types -extern "C" void FE_init_stage1(); // Initialize stage 1 -extern "C" void FE_init_stage2(); // Initialize stage 2 +extern "C" void FE_init_stage1(); // Initialize stage 1 +extern "C" void FE_init_stage2(); // Initialize stage 2 // Interface to Yacc parser class File; -extern "C" int FE_yyparse(); // Invode yyparse -extern "C" void FE_set_yyin(File *); // Set yyin +extern "C" int FE_yyparse(); // Invode yyparse +extern "C" void FE_set_yyin(File *); // Set yyin // Interface to constructors for objects need by the driver @@ -102,8 +102,8 @@ class UTL_Error; class UTL_Indenter; class UTL_String; -extern "C" UTL_Error * FE_new_UTL_Error(); -extern "C" UTL_Indenter * FE_new_UTL_Indenter(); -extern "C" UTL_String * FE_new_UTL_String(char *); +extern "C" UTL_Error * FE_new_UTL_Error(); +extern "C" UTL_Indenter * FE_new_UTL_Indenter(); +extern "C" UTL_String * FE_new_UTL_String(char *); #endif // _FE_EXTERN_FE_EXTERN_HH diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h index f9b9d5bbf45..0fe78e3e227 100644 --- a/TAO/TAO_IDL/include/fe_interface_header.h +++ b/TAO/TAO_IDL/include/fe_interface_header.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. /* ** DEPENDENCIES: utl_scoped_name.hh, ast_interface.hh, utl_scope.hh, -** ast_decl.hh +** ast_decl.hh ** ** USE: Included from fe.hh */ -class FE_InterfaceHeader +class FE_InterfaceHeader { public: // Operations @@ -94,16 +94,16 @@ public: private: // Data - UTL_ScopedName *pd_interface_name; // Interface name - AST_Interface **pd_inherits; // Inherited interfaces - long pd_n_inherits; // How many + UTL_ScopedName *pd_interface_name; // Interface name + AST_Interface **pd_inherits; // Inherited interfaces + long pd_n_inherits; // How many // Operations // Compile the flattened unique list of interfaces which this // interface inherits from - void compile_one_inheritance(AST_Interface *i); - void compile_inheritance(UTL_NameList *l); + void compile_one_inheritance(AST_Interface *i); + void compile_inheritance(UTL_NameList *l); }; #endif // _FE_INTERFACE_HEADER_FE_INTERFACE_HH diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h index 1c496ce9843..1d1b28b2371 100644 --- a/TAO/TAO_IDL/include/fe_private.h +++ b/TAO/TAO_IDL/include/fe_private.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -68,7 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _FE_FE_HH // fe_private.hh - Defines data which is private to the FE but -// which must be accessible throughout the FE +// which must be accessible throughout the FE /* ** DEPENDENCIES: NONE @@ -80,8 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. * FE includes */ -#include "fe_interface_header.h"// class FE_InterfaceHeader -#include "fe_declarator.h" // class FE_Declarator +#include "fe_interface_header.h"// class FE_InterfaceHeader +#include "fe_declarator.h" // class FE_Declarator /* * FE Operations diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h index c28a733f785..d67cd4be4e0 100644 --- a/TAO/TAO_IDL/include/global_extern.h +++ b/TAO/TAO_IDL/include/global_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -69,12 +69,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // global_extern.hh - Global data for the IDL compiler -extern IDL_GlobalData *idl_global; // Contains all "global" data +extern IDL_GlobalData *idl_global; // Contains all "global" data // Global functions for the IDL compiler // Return TRUE when the name of this AST_Decl can be reused in // a definition in this scope -extern idl_bool can_be_redefined(AST_Decl *); +extern idl_bool can_be_redefined(AST_Decl *); #endif // _GLOBAL_EXTERN_GLOBAL_EXTERN_HH diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h index 5989365150e..0b9161c511b 100644 --- a/TAO/TAO_IDL/include/idl.h +++ b/TAO/TAO_IDL/include/idl.h @@ -75,23 +75,27 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ace/ACE.h" // Most important ACE include file #include "ace/streams.h" // iostreams -#include "intlmacros.h" // Define macros for intl'ion +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <stdlib.h> // POSIX standard defns -#include <ctype.h> // External functions +#include "intlmacros.h" // Define macros for intl'ion -#include <sys/types.h> // POSIX standard types +#include <stdlib.h> // POSIX standard defns +#include <ctype.h> // External functions -#include "idl_narrow.h" // IDL Narrowing mechanism +#include <sys/types.h> // POSIX standard types -#include "idl_defines.h" // Constants for IDL compiler -#include "idl_fwd.h" // Forward decls of classes +#include "idl_narrow.h" // IDL Narrowing mechanism -#include "idl_bool.h" // Defines boolean for IDL +#include "idl_defines.h" // Constants for IDL compiler +#include "idl_fwd.h" // Forward decls of classes -#include "utl_string.h" // Defines utility string class -#include "utl_identifier.h" // Defines utility identifier class -#include "ast.h" // AST classes -#include "util.h" // Utility classes +#include "idl_bool.h" // Defines boolean for IDL + +#include "utl_string.h" // Defines utility string class +#include "utl_identifier.h" // Defines utility identifier class +#include "ast.h" // AST classes +#include "util.h" // Utility classes #endif // _IDL_IDL_HH diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h index c0741684896..838e7dbfcb8 100644 --- a/TAO/TAO_IDL/include/idl_bool.h +++ b/TAO/TAO_IDL/include/idl_bool.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -81,14 +81,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from idl.hh */ -#ifndef I_TRUE -#define I_TRUE 1 +#ifndef I_TRUE +#define I_TRUE 1 #endif -#ifndef I_FALSE -#define I_FALSE 0 +#ifndef I_FALSE +#define I_FALSE 0 #endif -typedef long idl_bool; +typedef long idl_bool; #endif // _IDL_BOOL_IDL_BOOL_HH diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h index 6cf062ee212..db7a7c6154d 100644 --- a/TAO/TAO_IDL/include/idl_defines.h +++ b/TAO/TAO_IDL/include/idl_defines.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,12 +73,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // This cannot be an enum since more than one value may be active at // a given time, hence bitflags are #define'd instead - -#define IDL_CF_VERSION (1 << 0) -#define IDL_CF_DUMP_AST (1 << 1) -#define IDL_CF_ONLY_PREPROC (1 << 2) -#define IDL_CF_ONLY_USAGE (1 << 3) -#define IDL_CF_INFORMATIVE (1 << 4) -#define IDL_CF_NOWARNINGS (1 << 5) - -#endif // _IDL_DEFINES_IDL_DEFINES_HH + +#define IDL_CF_VERSION (1 << 0) +#define IDL_CF_DUMP_AST (1 << 1) +#define IDL_CF_ONLY_PREPROC (1 << 2) +#define IDL_CF_ONLY_USAGE (1 << 3) +#define IDL_CF_INFORMATIVE (1 << 4) +#define IDL_CF_NOWARNINGS (1 << 5) + +#endif // _IDL_DEFINES_IDL_DEFINES_HH diff --git a/TAO/TAO_IDL/include/idl_extern.h b/TAO/TAO_IDL/include/idl_extern.h index efbe0ccdeb5..7cf1fb14e02 100644 --- a/TAO/TAO_IDL/include/idl_extern.h +++ b/TAO/TAO_IDL/include/idl_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -71,11 +71,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // // Global variables and functions for IDL compiler -#include "fe_extern.h" // External API of FE -#include "be_extern.h" // External API of BE -#include "drv_extern.h" // External API of DRV -#include "ast_extern.h" // External API of AST -#include "nr_extern.h" // External API of NR -#include "global_extern.h" // Global data +#include "fe_extern.h" // External API of FE +#include "be_extern.h" // External API of BE +#include "drv_extern.h" // External API of DRV +#include "ast_extern.h" // External API of AST +#include "nr_extern.h" // External API of NR +#include "global_extern.h" // Global data #endif // _IDL_EXTERN_IDL_EXTERN_HH diff --git a/TAO/TAO_IDL/include/idl_fwd.h b/TAO/TAO_IDL/include/idl_fwd.h index 7b9761418b4..5198f1bcae8 100644 --- a/TAO/TAO_IDL/include/idl_fwd.h +++ b/TAO/TAO_IDL/include/idl_fwd.h @@ -79,70 +79,70 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Class for global data representation: -class IDL_GlobalData; // Global data is stored in an - // instance of this +class IDL_GlobalData; // Global data is stored in an + // instance of this // Classes for utility of the IDL compiler: -class UTL_ScopeStack; // Stack of scopes -class UTL_Scope; // A definition scope (mixin) - -class UTL_LongList; // List of longs -class UTL_StrList; // List of strings -class UTL_StrlistActiveIterator; // Active iterator for list of strings -class UTL_IdList; // List of identifiers -class UTL_IdListActiveIterator; // Active iterator for list of id's -class UTL_ExceptList; // List of exceptions -class UTL_NameList; // List of scoped names -class UTL_ExprList; // List of expressions -class UTL_InterfList; // List of interfaces -class UTL_LabelList; // List of union branch labels -class UTL_DeclList; // List of declarators -class UTL_String; // String class -class UTL_Identifier; // Identifier class - -class UTL_Error; // Error class -class UTL_Indenter; // Indenter class +class UTL_ScopeStack; // Stack of scopes +class UTL_Scope; // A definition scope (mixin) + +class UTL_LongList; // List of longs +class UTL_StrList; // List of strings +class UTL_StrlistActiveIterator; // Active iterator for list of strings +class UTL_IdList; // List of identifiers +class UTL_IdListActiveIterator; // Active iterator for list of id's +class UTL_ExceptList; // List of exceptions +class UTL_NameList; // List of scoped names +class UTL_ExprList; // List of expressions +class UTL_InterfList; // List of interfaces +class UTL_LabelList; // List of union branch labels +class UTL_DeclList; // List of declarators +class UTL_String; // String class +class UTL_Identifier; // Identifier class + +class UTL_Error; // Error class +class UTL_Indenter; // Indenter class // Classes for utility of the FE. These classes are used only // by the FE but their forward declaration is needed because lists // of them are constructed by classes in UTL -class FE_InterfaceHeader; // Interface header -class FE_Declarator; // Declarator +class FE_InterfaceHeader; // Interface header +class FE_Declarator; // Declarator // Generator class for the AST -class AST_Generator; // Generate nodes of various types +class AST_Generator; // Generate nodes of various types // Classes for AST: -class AST_Decl; // The rock bottom base class - -class AST_PredefinedType; // A predefined type -class AST_Type; // An IDL type -class AST_ConcreteType; // An IDL concrete type -class AST_Module; // A module -class AST_Root; // The root of an AST (a module) -class AST_Interface; // An interface -class AST_InterfaceFwd; // A forward interface decl -class AST_Constant; // A constant declaration -class AST_Expression; // Value of an expression -class AST_Exception; // An exception declaration -class AST_Attribute; // An attribute declaration -class AST_Operation; // An operation declaration -class AST_Argument; // An argument to an operation -class AST_Union; // A union declaration -class AST_UnionBranch; // A branch in a union -class AST_UnionLabel; // A union branch label -class AST_Structure; // A structure declaration -class AST_Field; // A field in a structure or union -class AST_Enum; // An enum declaration -class AST_EnumVal; // An enumerator in an enum -class AST_Sequence; // A sequence declaration -class AST_String; // A string declaration -class AST_Array; // An array declaration -class AST_Typedef; // A typedef declaration +class AST_Decl; // The rock bottom base class + +class AST_PredefinedType; // A predefined type +class AST_Type; // An IDL type +class AST_ConcreteType; // An IDL concrete type +class AST_Module; // A module +class AST_Root; // The root of an AST (a module) +class AST_Interface; // An interface +class AST_InterfaceFwd; // A forward interface decl +class AST_Constant; // A constant declaration +class AST_Expression; // Value of an expression +class AST_Exception; // An exception declaration +class AST_Attribute; // An attribute declaration +class AST_Operation; // An operation declaration +class AST_Argument; // An argument to an operation +class AST_Union; // A union declaration +class AST_UnionBranch; // A branch in a union +class AST_UnionLabel; // A union branch label +class AST_Structure; // A structure declaration +class AST_Field; // A field in a structure or union +class AST_Enum; // An enum declaration +class AST_EnumVal; // An enumerator in an enum +class AST_Sequence; // A sequence declaration +class AST_String; // A string declaration +class AST_Array; // An array declaration +class AST_Typedef; // A typedef declaration class AST_Native; // A native declaration #endif // _IDL_FWD_IDL_FWD_HH diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 0f66796cb3e..8fe0d6e80b5 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -81,119 +81,119 @@ public: // better error messages can be produced, and for use by BEs in situations // where context sensitive behavior is required enum ParseState { - PS_NoState // No state - , PS_TypeDeclSeen // Seen complete typedef declaration - , PS_ConstDeclSeen // Seen complete const declaration - , PS_ExceptDeclSeen // Seen complete exception declaration - , PS_InterfaceDeclSeen // Seen complete interface declaration - , PS_ModuleDeclSeen // Seen complete module declaration - , PS_AttrDeclSeen // Seen complete attribute declaration - , PS_OpDeclSeen // Seen complete operation declaration - , PS_ModuleSeen // Seen a MODULE keyword - , PS_ModuleIDSeen // Seen the module ID - , PS_ModuleSqSeen // '{' seen for module - , PS_ModuleQsSeen // '}' seen for module - , PS_ModuleBodySeen // Seen complete module body - , PS_InterfaceSeen // Seen an INTERFACE keyword - , PS_InterfaceIDSeen // Seen the interface ID - , PS_InheritSpecSeen // Seen a complete inheritance spec - , PS_ForwardDeclSeen // Forward interface decl seen - , PS_InterfaceSqSeen // '{' seen for interface - , PS_InterfaceQsSeen // '}' seen for interface - , PS_InterfaceBodySeen // Seen an interface body - , PS_InheritColonSeen // Seen ':' in inheritance list - , PS_SNListCommaSeen // Seen ',' in list of scoped names - , PS_ScopedNameSeen // Seen a complete scoped name - , PS_SN_IDSeen // Seen an identifier as part of a scoped name - , PS_ScopeDelimSeen // Seen a scope delim as party of a scoped name - , PS_ConstSeen // Seen a CONST keyword - , PS_ConstTypeSeen // Parsed the type of a constant - , PS_ConstIDSeen // Seen the constant ID - , PS_ConstAssignSeen // Seen the '=' - , PS_ConstExprSeen // Seen the constant value expression - , PS_TypedefSeen // Seen a TYPEDEF keyword - , PS_TypeSpecSeen // Seen a complete type specification - , PS_DeclaratorsSeen // Seen a complete list of declarators - , PS_StructSeen // Seen a STRUCT keyword - , PS_StructIDSeen // Seen the struct ID - , PS_StructSqSeen // '{' seen for struct - , PS_StructQsSeen // '}' seen for struct - , PS_StructBodySeen // Seen complete body of struct decl - , PS_MemberTypeSeen // Seen type of struct or except member - , PS_MemberDeclsSeen // Seen decls of struct or except members - , PS_MemberDeclsCompleted // Completed one struct or except member to ';' - , PS_UnionSeen // Seen a UNION keyword - , PS_UnionIDSeen // Seen the union ID - , PS_SwitchSeen // Seen the SWITCH keyword - , PS_SwitchOpenParSeen // Seen the switch open par. - , PS_SwitchTypeSeen // Seen the switch type spec - , PS_SwitchCloseParSeen // Seen the switch close par. - , PS_UnionSqSeen // '{' seen for union - , PS_UnionQsSeen // '}' seen for union - , PS_DefaultSeen // Seen DEFAULT keyword - , PS_UnionLabelSeen // Seen label of union element - , PS_LabelColonSeen // Seen ':' of union branch label - , PS_LabelExprSeen // Seen expression of union branch label - , PS_UnionElemSeen // Seen a union element - , PS_UnionElemCompleted // Completed one union member up to ';' - , PS_CaseSeen // Seen a CASE keyword - , PS_UnionElemTypeSeen // Seen type spec for union element - , PS_UnionElemDeclSeen // Seen declarator for union element - , PS_UnionBodySeen // Seen completed union body - , PS_EnumSeen // Seen an ENUM keyword - , PS_EnumIDSeen // Seen the enum ID - , PS_EnumSqSeen // Seen '{' for enum - , PS_EnumQsSeen // Seen '}' for enum - , PS_EnumBodySeen // Seen complete enum body - , PS_EnumCommaSeen // Seen ',' in list of enumerators - , PS_SequenceSeen // Seen a SEQUENCE keyword - , PS_SequenceSqSeen // Seen '<' for sequence - , PS_SequenceQsSeen // Seen '>' for sequence - , PS_SequenceTypeSeen // Seen type decl for sequence - , PS_SequenceCommaSeen // Seen comma for sequence - , PS_SequenceExprSeen // Seen size expression for sequence - , PS_StringSeen // Seen a STRING keyword - , PS_StringSqSeen // Seen '<' for string - , PS_StringQsSeen // Seen '>' for string - , PS_StringExprSeen // Seen size expression for string - , PS_StringCompleted // Seen a string decl without size spec - , PS_ArrayIDSeen // Seen array ID - , PS_ArrayCompleted // Seen completed array declaration - , PS_DimSqSeen // Seen '[' for array dimension - , PS_DimQsSeen // Seen ']' for array dimension - , PS_DimExprSeen // Seen size expression for array dimension - , PS_AttrROSeen // Seen READONLY keyword - , PS_AttrSeen // Seen ATTRIBUTE keyword - , PS_AttrTypeSeen // Seen type decl for attribute - , PS_AttrDeclsSeen // Seen declarators for attribute - , PS_AttrCompleted // Seen complete attribute declaration - , PS_ExceptSeen // Seen EXCEPTION keyword - , PS_ExceptIDSeen // Seen exception identifier - , PS_ExceptSqSeen // Seen '{' for exception - , PS_ExceptQsSeen // Seen '}' for exception - , PS_ExceptBodySeen // Seen complete exception body - , PS_OpAttrSeen // Seen operation attribute - , PS_OpTypeSeen // Seen operation return type - , PS_OpIDSeen // Seen operation ID - , PS_OpParsCompleted // Completed operation param list - , PS_OpRaiseCompleted // Completed operation except list - , PS_OpContextCompleted // Completed operation context spec - , PS_OpCompleted // Completed operation statement - , PS_OpSqSeen // Seen '(' for operation - , PS_OpQsSeen // Seen ')' for operation - , PS_OpParCommaSeen // Seen ',' in list of op params - , PS_OpParDirSeen // Seen parameter direction - , PS_OpParTypeSeen // Seen parameter type - , PS_OpParDeclSeen // Seen parameter declaration - , PS_OpRaiseSeen // Seen RAISES keyword - , PS_OpRaiseSqSeen // Seen '(' for RAISES - , PS_OpRaiseQsSeen // Seen ')' for RAISES - , PS_OpContextSeen // Seen CONTEXT keyword - , PS_OpContextSqSeen // Seen '(' for CONTEXT - , PS_OpContextQsSeen // Seen ')' for CONTEXT - , PS_OpContextCommaSeen // Seen ',' for CONTEXT - , PS_DeclsCommaSeen // Seen ',' in declarators list - , PS_DeclsDeclSeen // Seen complete decl in decls list + PS_NoState // No state + , PS_TypeDeclSeen // Seen complete typedef declaration + , PS_ConstDeclSeen // Seen complete const declaration + , PS_ExceptDeclSeen // Seen complete exception declaration + , PS_InterfaceDeclSeen // Seen complete interface declaration + , PS_ModuleDeclSeen // Seen complete module declaration + , PS_AttrDeclSeen // Seen complete attribute declaration + , PS_OpDeclSeen // Seen complete operation declaration + , PS_ModuleSeen // Seen a MODULE keyword + , PS_ModuleIDSeen // Seen the module ID + , PS_ModuleSqSeen // '{' seen for module + , PS_ModuleQsSeen // '}' seen for module + , PS_ModuleBodySeen // Seen complete module body + , PS_InterfaceSeen // Seen an INTERFACE keyword + , PS_InterfaceIDSeen // Seen the interface ID + , PS_InheritSpecSeen // Seen a complete inheritance spec + , PS_ForwardDeclSeen // Forward interface decl seen + , PS_InterfaceSqSeen // '{' seen for interface + , PS_InterfaceQsSeen // '}' seen for interface + , PS_InterfaceBodySeen // Seen an interface body + , PS_InheritColonSeen // Seen ':' in inheritance list + , PS_SNListCommaSeen // Seen ',' in list of scoped names + , PS_ScopedNameSeen // Seen a complete scoped name + , PS_SN_IDSeen // Seen an identifier as part of a scoped name + , PS_ScopeDelimSeen // Seen a scope delim as party of a scoped name + , PS_ConstSeen // Seen a CONST keyword + , PS_ConstTypeSeen // Parsed the type of a constant + , PS_ConstIDSeen // Seen the constant ID + , PS_ConstAssignSeen // Seen the '=' + , PS_ConstExprSeen // Seen the constant value expression + , PS_TypedefSeen // Seen a TYPEDEF keyword + , PS_TypeSpecSeen // Seen a complete type specification + , PS_DeclaratorsSeen // Seen a complete list of declarators + , PS_StructSeen // Seen a STRUCT keyword + , PS_StructIDSeen // Seen the struct ID + , PS_StructSqSeen // '{' seen for struct + , PS_StructQsSeen // '}' seen for struct + , PS_StructBodySeen // Seen complete body of struct decl + , PS_MemberTypeSeen // Seen type of struct or except member + , PS_MemberDeclsSeen // Seen decls of struct or except members + , PS_MemberDeclsCompleted // Completed one struct or except member to ';' + , PS_UnionSeen // Seen a UNION keyword + , PS_UnionIDSeen // Seen the union ID + , PS_SwitchSeen // Seen the SWITCH keyword + , PS_SwitchOpenParSeen // Seen the switch open par. + , PS_SwitchTypeSeen // Seen the switch type spec + , PS_SwitchCloseParSeen // Seen the switch close par. + , PS_UnionSqSeen // '{' seen for union + , PS_UnionQsSeen // '}' seen for union + , PS_DefaultSeen // Seen DEFAULT keyword + , PS_UnionLabelSeen // Seen label of union element + , PS_LabelColonSeen // Seen ':' of union branch label + , PS_LabelExprSeen // Seen expression of union branch label + , PS_UnionElemSeen // Seen a union element + , PS_UnionElemCompleted // Completed one union member up to ';' + , PS_CaseSeen // Seen a CASE keyword + , PS_UnionElemTypeSeen // Seen type spec for union element + , PS_UnionElemDeclSeen // Seen declarator for union element + , PS_UnionBodySeen // Seen completed union body + , PS_EnumSeen // Seen an ENUM keyword + , PS_EnumIDSeen // Seen the enum ID + , PS_EnumSqSeen // Seen '{' for enum + , PS_EnumQsSeen // Seen '}' for enum + , PS_EnumBodySeen // Seen complete enum body + , PS_EnumCommaSeen // Seen ',' in list of enumerators + , PS_SequenceSeen // Seen a SEQUENCE keyword + , PS_SequenceSqSeen // Seen '<' for sequence + , PS_SequenceQsSeen // Seen '>' for sequence + , PS_SequenceTypeSeen // Seen type decl for sequence + , PS_SequenceCommaSeen // Seen comma for sequence + , PS_SequenceExprSeen // Seen size expression for sequence + , PS_StringSeen // Seen a STRING keyword + , PS_StringSqSeen // Seen '<' for string + , PS_StringQsSeen // Seen '>' for string + , PS_StringExprSeen // Seen size expression for string + , PS_StringCompleted // Seen a string decl without size spec + , PS_ArrayIDSeen // Seen array ID + , PS_ArrayCompleted // Seen completed array declaration + , PS_DimSqSeen // Seen '[' for array dimension + , PS_DimQsSeen // Seen ']' for array dimension + , PS_DimExprSeen // Seen size expression for array dimension + , PS_AttrROSeen // Seen READONLY keyword + , PS_AttrSeen // Seen ATTRIBUTE keyword + , PS_AttrTypeSeen // Seen type decl for attribute + , PS_AttrDeclsSeen // Seen declarators for attribute + , PS_AttrCompleted // Seen complete attribute declaration + , PS_ExceptSeen // Seen EXCEPTION keyword + , PS_ExceptIDSeen // Seen exception identifier + , PS_ExceptSqSeen // Seen '{' for exception + , PS_ExceptQsSeen // Seen '}' for exception + , PS_ExceptBodySeen // Seen complete exception body + , PS_OpAttrSeen // Seen operation attribute + , PS_OpTypeSeen // Seen operation return type + , PS_OpIDSeen // Seen operation ID + , PS_OpParsCompleted // Completed operation param list + , PS_OpRaiseCompleted // Completed operation except list + , PS_OpContextCompleted // Completed operation context spec + , PS_OpCompleted // Completed operation statement + , PS_OpSqSeen // Seen '(' for operation + , PS_OpQsSeen // Seen ')' for operation + , PS_OpParCommaSeen // Seen ',' in list of op params + , PS_OpParDirSeen // Seen parameter direction + , PS_OpParTypeSeen // Seen parameter type + , PS_OpParDeclSeen // Seen parameter declaration + , PS_OpRaiseSeen // Seen RAISES keyword + , PS_OpRaiseSqSeen // Seen '(' for RAISES + , PS_OpRaiseQsSeen // Seen ')' for RAISES + , PS_OpContextSeen // Seen CONTEXT keyword + , PS_OpContextSqSeen // Seen '(' for CONTEXT + , PS_OpContextQsSeen // Seen ')' for CONTEXT + , PS_OpContextCommaSeen // Seen ',' for CONTEXT + , PS_DeclsCommaSeen // Seen ',' in declarators list + , PS_DeclsDeclSeen // Seen complete decl in decls list , PS_NativeSeen // Seen a native declaration , PS_PragmaPrefixSyntax // Could not parse the #pragma prefix }; @@ -203,97 +203,97 @@ public: virtual ~IDL_GlobalData() {} // Operations - virtual UTL_ScopeStack *scopes(); // Scopes stack - virtual void set_scopes(UTL_ScopeStack *); - // Set it + virtual UTL_ScopeStack *scopes(); // Scopes stack + virtual void set_scopes(UTL_ScopeStack *); + // Set it - virtual AST_Root *root(); // Root of AST - virtual void set_root(AST_Root *); // Set it + virtual AST_Root *root(); // Root of AST + virtual void set_root(AST_Root *); // Set it - virtual AST_Generator *gen(); // Generator - virtual void set_gen(AST_Generator *);// Set it + virtual AST_Generator *gen(); // Generator + virtual void set_gen(AST_Generator *);// Set it - virtual UTL_Error *err(); // Error reporter - virtual void set_err(UTL_Error *); // Set it + virtual UTL_Error *err(); // Error reporter + virtual void set_err(UTL_Error *); // Set it - virtual long err_count(); // How many errors? - virtual void set_err_count(long); // Set it + virtual long err_count(); // How many errors? + virtual void set_err_count(long); // Set it - virtual long lineno(); // Where in file? - virtual void set_lineno(long); // Set it + virtual long lineno(); // Where in file? + virtual void set_lineno(long); // Set it - virtual String *filename(); // What file? - virtual void set_filename(String *); // Set it + virtual String *filename(); // What file? + virtual void set_filename(String *); // Set it - virtual String *main_filename(); // What's the main - // file name? - virtual void set_main_filename(String *); - // Set it + virtual String *main_filename(); // What's the main + // file name? + virtual void set_main_filename(String *); + // Set it - virtual String *real_filename(); // What's the real - // file name? - virtual void set_real_filename(String *); - // Set it + virtual String *real_filename(); // What's the real + // file name? + virtual void set_real_filename(String *); + // Set it - virtual String *stripped_filename(); // Stripped filename - virtual void set_stripped_filename(String *); // Set it + virtual String *stripped_filename(); // Stripped filename + virtual void set_stripped_filename(String *); // Set it - virtual idl_bool imported(); // Are we imported? - virtual idl_bool import(); // Is import on? - virtual void set_import(idl_bool); // Set it + virtual idl_bool imported(); // Are we imported? + virtual idl_bool import(); // Is import on? + virtual void set_import(idl_bool); // Set it - virtual idl_bool in_main_file(); // Are we? - virtual void set_in_main_file(idl_bool); // Set it + virtual idl_bool in_main_file(); // Are we? + virtual void set_in_main_file(idl_bool); // Set it - virtual char *prog_name(); // Invoked as.. - virtual void set_prog_name(char *); // Set it + virtual char *prog_name(); // Invoked as.. + virtual void set_prog_name(char *); // Set it - virtual char *cpp_location(); // Where's CPP? - virtual void set_cpp_location(char *);// Set it + virtual char *cpp_location(); // Where's CPP? + virtual void set_cpp_location(char *);// Set it - virtual long compile_flags(); // What flags are on? - virtual void set_compile_flags(long);// Turn some on or off + virtual long compile_flags(); // What flags are on? + virtual void set_compile_flags(long);// Turn some on or off - virtual char *be(); // Get BE to use - virtual void set_be(char *); // Set it + virtual char *be(); // Get BE to use + virtual void set_be(char *); // Set it - virtual char *local_escapes(); // Get local escapes - virtual void set_local_escapes(char *);// Set it + virtual char *local_escapes(); // Get local escapes + virtual void set_local_escapes(char *);// Set it - virtual UTL_Indenter *indent(); // Get indenter - virtual void set_indent(UTL_Indenter *); - // Set it + virtual UTL_Indenter *indent(); // Get indenter + virtual void set_indent(UTL_Indenter *); + // Set it - virtual UTL_StrList *pragmas(); // Get pragmas - virtual void set_pragmas(UTL_StrList *);// Set it + virtual UTL_StrList *pragmas(); // Get pragmas + virtual void set_pragmas(UTL_StrList *);// Set it - virtual idl_bool read_from_stdin(); // Reading from stdin? - virtual void set_read_from_stdin(idl_bool); // Set it + virtual idl_bool read_from_stdin(); // Reading from stdin? + virtual void set_read_from_stdin(idl_bool); // Set it - virtual void store_include_file_name(String *); + virtual void store_include_file_name(String *); - virtual String **include_file_names(); // Array of file names - virtual void set_include_file_names(String **); // Set it + virtual String **include_file_names(); // Array of file names + virtual void set_include_file_names(String **); // Set it - virtual unsigned long n_include_file_names(); // How many - virtual void set_n_include_file_names(unsigned long n); + virtual unsigned long n_include_file_names(); // How many + virtual void set_n_include_file_names(unsigned long n); // = Access methods to deal with other IDL files included in the main // IDL file. These IDL files are exactly the same strings that are // "#include"d in the main IDL file, not the ones after CC // preprocessor parsed the file. - + // Just storing the pointer. No memory will be allocated. virtual void add_to_included_idl_files (char* file_name); - - // Get all the files. + + // Get all the files. virtual char** included_idl_files (void); - + // The number of currently availabe include files. virtual size_t n_included_idl_files (void); - - virtual ParseState parse_state(); // What state we're in - virtual void set_parse_state(ParseState s); // Set it + + virtual ParseState parse_state(); // What state we're in + virtual void set_parse_state(ParseState s); // Set it // Convert from a predefined type to an expression type virtual AST_Expression::ExprType @@ -358,76 +358,76 @@ public: // macro definition. // = Set and get methods for different file name endings. - + virtual void client_hdr_ending (const char* s); - // Set the client_hdr_ending. - + // Set the client_hdr_ending. + virtual const char* client_hdr_ending (void) const; // Get the client_hdr_ending. - + virtual void client_inline_ending (const char* s); // Set the client_inline_ending. - + virtual const char* client_inline_ending (void) const; - // Get the client_inline_ending. - + // Get the client_inline_ending. + virtual void client_stub_ending (const char* s); // Set the client_stub_ending. - + virtual const char* client_stub_ending (void) const; // Get the client_stub_ending. - + virtual void server_hdr_ending (const char* s); // Set the server_hdr_ending. - + virtual const char* server_hdr_ending (void) const; // Get the server_hdr_ending. - + virtual void server_template_hdr_ending (const char* s); // Set the server_template_hdr_ending. - - virtual const char* server_template_hdr_ending (void) const; + + virtual const char* server_template_hdr_ending (void) const; // Get the server_template_hdr_ending. - + virtual void server_skeleton_ending (const char* s); // Set the server_skeleton_ending. - + virtual const char* server_skeleton_ending (void) const; // Get the server_skeleton_ending. - + virtual void server_template_skeleton_ending (const char* s); // Set the server_template_skeleton_ending. - + virtual const char* server_template_skeleton_ending (void) const; // Get the server_template_skeleton_ending. - + virtual void server_inline_ending (const char* s); // Set the server_inline_ending. virtual const char* server_inline_ending (void) const; // Get the server_inline_ending. - + virtual void server_template_inline_ending (const char* s); // Set the server_template_inline_ending. - + virtual const char* server_template_inline_ending (void) const; // Get the server_template_inline_ending. virtual void output_dir (const char* s); // Set the directory where all the IDL-Compiler-Generated files are // to be kept. Default is current directory from which the - // <tao_idl> is called. + // <tao_idl> is called. virtual const char* output_dir (void) const; // Get the directory where all the IDL-Compiler-Generated files are // to be kept. Default is current directory from which the - // <tao_idl> is called. + // <tao_idl> is called. virtual void gperf_path (const char* s); // Set the path for the perfect hashing program (GPERF). virtual const char* gperf_path (void) const; - // Get the path for the perfect hashing program (GPERF). + // Get the path for the perfect hashing program (GPERF). virtual void any_support (idl_bool); // enable suppressing any support @@ -445,100 +445,100 @@ public: // enable compiled marshaling support virtual idl_bool compiled_marshaling (void); - // check if we use compiled marshaling + // check if we use compiled marshaling virtual void exception_support (idl_bool); // enable real C++ exceptions virtual idl_bool exception_support (void); - // check if real C++ exception support is to be enabled + // check if real C++ exception support is to be enabled virtual void opt_tc (idl_bool); // enable optimized typecodes virtual idl_bool opt_tc (void); // check if TypeCodes need be optimized - + private: // Data - UTL_ScopeStack *pd_scopes; // Store scopes stack - AST_Root *pd_root; // Store AST root - AST_Generator *pd_gen; // Store generator - UTL_Error *pd_err; // Error object - long pd_err_count; // Count of errors - long pd_lineno; // What line # - String *pd_filename; // What file - String *pd_main_filename; // What main filename - String *pd_real_filename; // What real filename - String *pd_stripped_filename; // Stripped filename - idl_bool pd_import; // Is import on? - idl_bool pd_in_main_file; // Are we in it? - char *pd_prog_name; // Argv[0] - char *pd_cpp_location; // Where to find CPP - long pd_compile_flags; // Compile flags - char *pd_be; // BE name to use - char *pd_local_escapes; // Trapdoor argument - UTL_Indenter *pd_indent; // Indent object - UTL_StrList *pd_pragmas; // List of pragmas - // as its being built - idl_bool pd_read_from_stdin; // Reading from stdin? - String **pd_include_file_names;// Array of file names. - unsigned long pd_n_include_file_names;// How many. - unsigned long pd_n_alloced_file_names;// How many alloced. + UTL_ScopeStack *pd_scopes; // Store scopes stack + AST_Root *pd_root; // Store AST root + AST_Generator *pd_gen; // Store generator + UTL_Error *pd_err; // Error object + long pd_err_count; // Count of errors + long pd_lineno; // What line # + String *pd_filename; // What file + String *pd_main_filename; // What main filename + String *pd_real_filename; // What real filename + String *pd_stripped_filename; // Stripped filename + idl_bool pd_import; // Is import on? + idl_bool pd_in_main_file; // Are we in it? + char *pd_prog_name; // Argv[0] + char *pd_cpp_location; // Where to find CPP + long pd_compile_flags; // Compile flags + char *pd_be; // BE name to use + char *pd_local_escapes; // Trapdoor argument + UTL_Indenter *pd_indent; // Indent object + UTL_StrList *pd_pragmas; // List of pragmas + // as its being built + idl_bool pd_read_from_stdin; // Reading from stdin? + String **pd_include_file_names;// Array of file names. + unsigned long pd_n_include_file_names;// How many. + unsigned long pd_n_alloced_file_names;// How many alloced. char** included_idl_files_; // IDL files that are "#include'd. - + size_t n_included_idl_files_; // The number of such idl files that are currently stored. - + size_t n_allocated_idl_files_; // For char*'s have been allocated for this. - - ParseState pd_parse_state; // Parse state we're in. + + ParseState pd_parse_state; // Parse state we're in. // Operations - long seen_include_file_before(String *); - // Seen this include - // before? + long seen_include_file_before(String *); + // Seen this include + // before? String *pd_idl_src_file; // IDL source file. char* export_macro_; char* export_include_; - + // Client's header file name ending. Default is "C.h". - char* client_hdr_ending_; - + char* client_hdr_ending_; + // Client's stub's file name ending. Default is "C.cpp". char* client_stub_ending_; - + // Client's inline file name ending. Default is "C.i". - char* client_inline_ending_; - + char* client_inline_ending_; + // Server's hdr file name ending. Default is "S.h". char* server_hdr_ending_; - + // Server's template hdr file name ending. Default is "S_T.h". char* server_template_hdr_ending_; - + // Server's skeleton file name ending. Default is "S.cpp". char* server_skeleton_ending_; - + // Server's template skeleton file name ending. Default is - // "S_T.cpp". + // "S_T.cpp". char* server_template_skeleton_ending_; - + // Server's inline file name ending. Default is "S.i". char* server_inline_ending_; - + // Server's template inline file name ending. Default is "S_T.i". char* server_template_inline_ending_; // Path for the perfect hash generator(gperf) program. Default // is $ACE_ROOT/bin/gperf. char* gperf_path_; - + // Directory where all the IDL-Compiler-Generated files are to be // kept. Default value is 0 for this string which means the current // directory from which the <tao_idl> is called. @@ -560,7 +560,7 @@ private: // do we generate optimized typecodes? }; -#endif //_IDL_IDL_GLOBAL_HH +#endif //_IDL_IDL_GLOBAL_HH diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h index 7b770612682..f861a851277 100644 --- a/TAO/TAO_IDL/include/idl_narrow.h +++ b/TAO/TAO_IDL/include/idl_narrow.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -64,8 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -#ifndef _IDL_NARROW_IDL_NARROW_HH -#define _IDL_NARROW_IDL_NARROW_HH +#ifndef _IDL_NARROW_IDL_NARROW_HH +#define _IDL_NARROW_IDL_NARROW_HH // idl_narrow.hh // @@ -95,11 +95,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // IMPL_NARROW_METHODSn where n is 0,1,2 and 3 are provided. // DEF_NARROW_METHODSn where n is 0,1,2 and 3 are provided. -extern char *type_id_to_string(long); +extern char *type_id_to_string(long); #define DEF_NARROW_METHODS0(TYPE)\ -static int type_id(); \ -virtual void *narrow(long type_const) +static int type_id(); \ +virtual void *narrow(long type_const) #define IMPL_NARROW_METHODS0(TYPE)\ @@ -108,17 +108,17 @@ TYPE::type_id()\ {\ return 0;\ }\ -void * \ +void * \ TYPE::narrow(long type_const) {\ - void *rval = NULL; \ + void *rval = NULL; \ if (type_const == (long)&TYPE::type_id) \ rval = this; \ return rval; \ } #define DEF_NARROW_METHODS1(TYPE,PARENT) \ -static int type_id(); \ -virtual void *narrow(long type_const) +static int type_id(); \ +virtual void *narrow(long type_const) #define IMPL_NARROW_METHODS1(TYPE,PARENT) \ @@ -127,9 +127,9 @@ TYPE::type_id() \ {\ return 0;\ }\ -void * \ +void * \ TYPE::narrow(long type_const) {\ - void *rval = NULL; \ + void *rval = NULL; \ if (type_const == (long)&TYPE::type_id) \ rval = this; \ if (rval == NULL) \ @@ -138,8 +138,8 @@ TYPE::narrow(long type_const) {\ } #define DEF_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \ -static int type_id(); \ -virtual void *narrow(long type_const) +static int type_id(); \ +virtual void *narrow(long type_const) #define IMPL_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \ @@ -148,7 +148,7 @@ TYPE::type_id() \ {\ return 0;\ }\ -void * \ +void * \ TYPE::narrow(long type_const) { \ void *rval = NULL; \ if (type_const == (long)&TYPE::type_id) \ @@ -161,8 +161,8 @@ TYPE::narrow(long type_const) { \ } #define DEF_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \ -static int type_id(); \ -virtual void *narrow(long type_const) +static int type_id(); \ +virtual void *narrow(long type_const) #define IMPL_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \ @@ -171,7 +171,7 @@ TYPE::type_id() \ {\ return 0;\ }\ -void * \ +void * \ TYPE::narrow(long type_const) {\ void *rval = NULL; \ if (type_const == (long)&TYPE::type_id) \ @@ -186,8 +186,8 @@ TYPE::narrow(long type_const) {\ } #define DEF_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \ -static int type_id(); \ -virtual void *narrow(long type_const) +static int type_id(); \ +virtual void *narrow(long type_const) #define IMPL_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \ @@ -196,7 +196,7 @@ TYPE::type_id() \ {\ return 0;\ }\ -void * \ +void * \ TYPE::narrow(long type_const) {\ void *rval = NULL; \ if (type_const == (long)&TYPE::type_id) \ @@ -213,8 +213,8 @@ TYPE::narrow(long type_const) {\ } #define DEF_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \ -static int type_id(); \ -virtual void *narrow(long type_const) +static int type_id(); \ +virtual void *narrow(long type_const) #define IMPL_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \ @@ -223,7 +223,7 @@ TYPE::type_id() \ {\ return 0;\ }\ -void * \ +void * \ TYPE::narrow(long type_const) {\ void *rval = NULL; \ if (type_const == (long)&TYPE::type_id) \ @@ -242,7 +242,7 @@ TYPE::narrow(long type_const) {\ } #define DEF_NARROW_FROM_DECL(TYPE)\ -static TYPE *narrow_from_decl(AST_Decl *t) +static TYPE *narrow_from_decl(AST_Decl *t) #define IMPL_NARROW_FROM_DECL(TYPE)\ @@ -252,7 +252,7 @@ TYPE::narrow_from_decl(AST_Decl *t) { \ } #define DEF_NARROW_FROM_SCOPE(TYPE)\ -static TYPE *narrow_from_scope(UTL_Scope *t) +static TYPE *narrow_from_scope(UTL_Scope *t) #define IMPL_NARROW_FROM_SCOPE(TYPE)\ @@ -261,4 +261,4 @@ TYPE::narrow_from_scope(UTL_Scope *t) { \ return (TYPE *)t->narrow((long)&TYPE::type_id);\ } -#endif // _IDL_NARROW_IDL_NARROW_HH +#endif // _IDL_NARROW_IDL_NARROW_HH diff --git a/TAO/TAO_IDL/include/intlmacros.h b/TAO/TAO_IDL/include/intlmacros.h index a3a8c8c5cf0..5b5fddd8723 100644 --- a/TAO/TAO_IDL/include/intlmacros.h +++ b/TAO/TAO_IDL/include/intlmacros.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -64,18 +64,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -#ifndef _IDL_INTLMACROS_HH +#ifndef _IDL_INTLMACROS_HH #define _IDL_INTLMACROS_HH // intlmacros.hh // // Define macros which conditionalize string internationalization -#ifndef DOMF_TEXT_DEVEL_DOMAIN -#define DOMF_TEXT_DEVEL_DOMAIN "SUNW_DOE_DOMF_DEVEL" -#endif // DOMF_TEXT_DEVEL_DOMAIN +#ifndef DOMF_TEXT_DEVEL_DOMAIN +#define DOMF_TEXT_DEVEL_DOMAIN "SUNW_DOE_DOMF_DEVEL" +#endif // DOMF_TEXT_DEVEL_DOMAIN -#define GTDEVEL(s) s +#define GTDEVEL(s) s #if defined(__STDC__) #define CONV(p) #p @@ -84,4 +84,4 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define MKSTR(p) "p" #endif -#endif // _IDL_INTLMACROS_HH +#endif // _IDL_INTLMACROS_HH diff --git a/TAO/TAO_IDL/include/nr_extern.h b/TAO/TAO_IDL/include/nr_extern.h index efa8be05209..27e01d58edb 100644 --- a/TAO/TAO_IDL/include/nr_extern.h +++ b/TAO/TAO_IDL/include/nr_extern.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -70,7 +70,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // nr_extern.hh - Defines entry points provided by narrowing // Convert between an UTL_Scope and an AST_Decl -extern AST_Decl *ScopeAsDecl(UTL_Scope *s); -extern UTL_Scope *DeclAsScope(AST_Decl *d); +extern AST_Decl *ScopeAsDecl(UTL_Scope *s); +extern UTL_Scope *DeclAsScope(AST_Decl *d); -#endif // _NR_EXTERN_NR_EXTERN_HH +#endif // _NR_EXTERN_NR_EXTERN_HH diff --git a/TAO/TAO_IDL/include/util.h b/TAO/TAO_IDL/include/util.h index fa8d871e721..b16d2e14bff 100644 --- a/TAO/TAO_IDL/include/util.h +++ b/TAO/TAO_IDL/include/util.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -69,19 +69,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // util.hh - Includes commonly used things defined in the util directory -#include "utl_stack.h" // class fe_stack -#include "utl_exprlist.h" // class UTL_ExprList -#include "utl_strlist.h" // class UTL_StrList -#include "utl_idlist.h" // class UTL_IdList -#include "utl_exceptlist.h" // class UTL_ExceptList -#include "utl_namelist.h" // class UTL_NameList -#include "utl_labellist.h" // class UTL_LabelList -#include "utl_decllist.h" // class UTL_DeclList +#include "utl_stack.h" // class fe_stack +#include "utl_exprlist.h" // class UTL_ExprList +#include "utl_strlist.h" // class UTL_StrList +#include "utl_idlist.h" // class UTL_IdList +#include "utl_exceptlist.h" // class UTL_ExceptList +#include "utl_namelist.h" // class UTL_NameList +#include "utl_labellist.h" // class UTL_LabelList +#include "utl_decllist.h" // class UTL_DeclList -#include "idl_global.h" // Class IDL_GlobalData +#include "idl_global.h" // Class IDL_GlobalData -#include "utl_error.h" // class UTL_Error +#include "utl_error.h" // class UTL_Error -#include "utl_indenter.h" // class UTL_Indenter +#include "utl_indenter.h" // class UTL_Indenter #endif // _UTIL_UTIL_HH diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h index 4a33e154ac2..030cef94568 100644 --- a/TAO/TAO_IDL/include/utl_decllist.h +++ b/TAO/TAO_IDL/include/utl_decllist.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: utl_list.hh, fe_declarator.hh @@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_DeclList : public UTL_List +class UTL_DeclList : public UTL_List { public: // Operations @@ -98,15 +98,15 @@ public: UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr); // Get element - FE_Declarator *head(); + FE_Declarator *head(); private: // Data - FE_Declarator *pd_car_data; // The element this list stores + FE_Declarator *pd_car_data; // The element this list stores }; // Active iterator fooor UTL_DeclList -class UTL_DecllistActiveIterator : public UTL_ListActiveIterator +class UTL_DecllistActiveIterator : public UTL_ListActiveIterator { public: // Operations @@ -115,7 +115,7 @@ public: UTL_DecllistActiveIterator(UTL_DeclList *s); // Get current item - FE_Declarator *item(); + FE_Declarator *item(); }; #endif // _UTL_DECLLIST_UTL_DECLLIST_HH diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 199e20d927f..f0d4bb86d2e 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -78,103 +78,103 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_Error +class UTL_Error { public: enum ErrorCode { - EIDL_SYNTAX_ERROR, // Syntax error in IDL input - // More details will be gleaned from examining - // idl_global->parse_state() - EIDL_REDEF, // Redefinition - EIDL_REDEF_SCOPE, // Redefinition inside defining scope - EIDL_DEF_USE, // Definition after use - EIDL_MULTIPLE_BRANCH, // More than one union branch with this - // label - EIDL_COERCION_FAILURE, // Coercion failure - EIDL_SCOPE_CONFLICT, // Between fwd declare and full declare - EIDL_ONEWAY_CONFLICT, // Between op decl and argument direction - EIDL_DISC_TYPE, // Illegal discriminator type in union - EIDL_LABEL_TYPE, // Mismatch with discriminator type in union - EIDL_ILLEGAL_ADD, // Illegal add action - EIDL_ILLEGAL_USE, // Illegal type used in expression - EIDL_ILLEGAL_RAISES, // Error in "raises" clause - EIDL_ILLEGAL_CONTEXT, // Error in "context" clause - EIDL_CANT_INHERIT, // Cannot inherit from non-interface - EIDL_LOOKUP_ERROR, // Identifier not found - EIDL_INHERIT_FWD_ERROR, // Cannot inherit from fwd decl interface - EIDL_CONSTANT_EXPECTED, // We got something else.. - EIDL_NAME_CASE_ERROR, // Spelling differences found - EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator - EIDL_ENUM_VAL_NOT_FOUND, // Didnt find an enumerator with that name - EIDL_EVAL_ERROR, // Error in evaluating expression - EIDL_AMBIGUOUS, // Ambiguous name definition - EIDL_DECL_NOT_DEFINED, // Forward declared but never defined - EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf - EIDL_RECURSIVE_TYPE, // Illegal recursive use of type - EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation - EIDL_NOT_A_TYPE, // Not a type - EIDL_BACK_END, // Back end error - EIDL_OK // No error + EIDL_SYNTAX_ERROR, // Syntax error in IDL input + // More details will be gleaned from examining + // idl_global->parse_state() + EIDL_REDEF, // Redefinition + EIDL_REDEF_SCOPE, // Redefinition inside defining scope + EIDL_DEF_USE, // Definition after use + EIDL_MULTIPLE_BRANCH, // More than one union branch with this + // label + EIDL_COERCION_FAILURE, // Coercion failure + EIDL_SCOPE_CONFLICT, // Between fwd declare and full declare + EIDL_ONEWAY_CONFLICT, // Between op decl and argument direction + EIDL_DISC_TYPE, // Illegal discriminator type in union + EIDL_LABEL_TYPE, // Mismatch with discriminator type in union + EIDL_ILLEGAL_ADD, // Illegal add action + EIDL_ILLEGAL_USE, // Illegal type used in expression + EIDL_ILLEGAL_RAISES, // Error in "raises" clause + EIDL_ILLEGAL_CONTEXT, // Error in "context" clause + EIDL_CANT_INHERIT, // Cannot inherit from non-interface + EIDL_LOOKUP_ERROR, // Identifier not found + EIDL_INHERIT_FWD_ERROR, // Cannot inherit from fwd decl interface + EIDL_CONSTANT_EXPECTED, // We got something else.. + EIDL_NAME_CASE_ERROR, // Spelling differences found + EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator + EIDL_ENUM_VAL_NOT_FOUND, // Didnt find an enumerator with that name + EIDL_EVAL_ERROR, // Error in evaluating expression + EIDL_AMBIGUOUS, // Ambiguous name definition + EIDL_DECL_NOT_DEFINED, // Forward declared but never defined + EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf + EIDL_RECURSIVE_TYPE, // Illegal recursive use of type + EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation + EIDL_NOT_A_TYPE, // Not a type + EIDL_BACK_END, // Back end error + EIDL_OK // No error }; // Operations // Report errors with varying numbers of arguments - void error0(ErrorCode e); - void error1(ErrorCode e, AST_Decl *t); - void error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2); - void error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3); + void error0(ErrorCode e); + void error1(ErrorCode e, AST_Decl *t); + void error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2); + void error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3); // Report a syntax error in IDL input - void syntax_error(IDL_GlobalData::ParseState ps); + void syntax_error(IDL_GlobalData::ParseState ps); // Report a name being used with different spellings - void name_case_error(char *n, char *t); + void name_case_error(char *n, char *t); // Report an unsuccesful coercion attempt - void coercion_error(AST_Expression *v, AST_Expression::ExprType t); + void coercion_error(AST_Expression *v, AST_Expression::ExprType t); // Report a failed name lookup attempt - void lookup_error(UTL_ScopedName *n); + void lookup_error(UTL_ScopedName *n); // Report an attempt to use a forward declared interface which // hasn't been defined yet in an inheritance spec - void inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f); + void inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f); // Report an attempt to inherit from something other than an interface - void inheritance_error(UTL_ScopedName *n, AST_Decl *d); + void inheritance_error(UTL_ScopedName *n, AST_Decl *d); // Report an error while evaluating an expression (division by zero, etc.) - void eval_error(AST_Expression *d); + void eval_error(AST_Expression *d); // Report a situation where a constant was expected but we got // something else instead. This most likely is a case where a union // label did not evaluate to a constant - void constant_expected(UTL_ScopedName *n, AST_Decl *d); + void constant_expected(UTL_ScopedName *n, AST_Decl *d); // Report a situation where an enumerator was expected but we got // something else instead. This occurs when a union with an enum // discriminator is being parsed and one of the branch labels is // not an enumerator in that enum - void enum_val_expected(AST_Union *t, AST_UnionLabel *l); + void enum_val_expected(AST_Union *t, AST_UnionLabel *l); // Report a failed enumerator lookup in an enum - void enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n); + void enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n); // Report an ambiguous name definition - void ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d); + void ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d); // Report a forward declared interface which was never defined - void fwd_decl_not_defined(AST_Interface *d); + void fwd_decl_not_defined(AST_Interface *d); // Report attempt to lookup in forward declared interface - void fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n); + void fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n); // Report a redefinition in scope - void redefinition_in_scope(AST_Decl *t, AST_Decl *s); + void redefinition_in_scope(AST_Decl *t, AST_Decl *s); // Report not a type error - void not_a_type(AST_Decl *d); + void not_a_type(AST_Decl *d); // Report back-end error void back_end(long lineno, String *s); diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h index 199e20d927f..f0d4bb86d2e 100644 --- a/TAO/TAO_IDL/include/utl_error.h +++ b/TAO/TAO_IDL/include/utl_error.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -78,103 +78,103 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_Error +class UTL_Error { public: enum ErrorCode { - EIDL_SYNTAX_ERROR, // Syntax error in IDL input - // More details will be gleaned from examining - // idl_global->parse_state() - EIDL_REDEF, // Redefinition - EIDL_REDEF_SCOPE, // Redefinition inside defining scope - EIDL_DEF_USE, // Definition after use - EIDL_MULTIPLE_BRANCH, // More than one union branch with this - // label - EIDL_COERCION_FAILURE, // Coercion failure - EIDL_SCOPE_CONFLICT, // Between fwd declare and full declare - EIDL_ONEWAY_CONFLICT, // Between op decl and argument direction - EIDL_DISC_TYPE, // Illegal discriminator type in union - EIDL_LABEL_TYPE, // Mismatch with discriminator type in union - EIDL_ILLEGAL_ADD, // Illegal add action - EIDL_ILLEGAL_USE, // Illegal type used in expression - EIDL_ILLEGAL_RAISES, // Error in "raises" clause - EIDL_ILLEGAL_CONTEXT, // Error in "context" clause - EIDL_CANT_INHERIT, // Cannot inherit from non-interface - EIDL_LOOKUP_ERROR, // Identifier not found - EIDL_INHERIT_FWD_ERROR, // Cannot inherit from fwd decl interface - EIDL_CONSTANT_EXPECTED, // We got something else.. - EIDL_NAME_CASE_ERROR, // Spelling differences found - EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator - EIDL_ENUM_VAL_NOT_FOUND, // Didnt find an enumerator with that name - EIDL_EVAL_ERROR, // Error in evaluating expression - EIDL_AMBIGUOUS, // Ambiguous name definition - EIDL_DECL_NOT_DEFINED, // Forward declared but never defined - EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf - EIDL_RECURSIVE_TYPE, // Illegal recursive use of type - EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation - EIDL_NOT_A_TYPE, // Not a type - EIDL_BACK_END, // Back end error - EIDL_OK // No error + EIDL_SYNTAX_ERROR, // Syntax error in IDL input + // More details will be gleaned from examining + // idl_global->parse_state() + EIDL_REDEF, // Redefinition + EIDL_REDEF_SCOPE, // Redefinition inside defining scope + EIDL_DEF_USE, // Definition after use + EIDL_MULTIPLE_BRANCH, // More than one union branch with this + // label + EIDL_COERCION_FAILURE, // Coercion failure + EIDL_SCOPE_CONFLICT, // Between fwd declare and full declare + EIDL_ONEWAY_CONFLICT, // Between op decl and argument direction + EIDL_DISC_TYPE, // Illegal discriminator type in union + EIDL_LABEL_TYPE, // Mismatch with discriminator type in union + EIDL_ILLEGAL_ADD, // Illegal add action + EIDL_ILLEGAL_USE, // Illegal type used in expression + EIDL_ILLEGAL_RAISES, // Error in "raises" clause + EIDL_ILLEGAL_CONTEXT, // Error in "context" clause + EIDL_CANT_INHERIT, // Cannot inherit from non-interface + EIDL_LOOKUP_ERROR, // Identifier not found + EIDL_INHERIT_FWD_ERROR, // Cannot inherit from fwd decl interface + EIDL_CONSTANT_EXPECTED, // We got something else.. + EIDL_NAME_CASE_ERROR, // Spelling differences found + EIDL_ENUM_VAL_EXPECTED, // Expected an enumerator + EIDL_ENUM_VAL_NOT_FOUND, // Didnt find an enumerator with that name + EIDL_EVAL_ERROR, // Error in evaluating expression + EIDL_AMBIGUOUS, // Ambiguous name definition + EIDL_DECL_NOT_DEFINED, // Forward declared but never defined + EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf + EIDL_RECURSIVE_TYPE, // Illegal recursive use of type + EIDL_NONVOID_ONEWAY, // Non-void return type in oneway operation + EIDL_NOT_A_TYPE, // Not a type + EIDL_BACK_END, // Back end error + EIDL_OK // No error }; // Operations // Report errors with varying numbers of arguments - void error0(ErrorCode e); - void error1(ErrorCode e, AST_Decl *t); - void error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2); - void error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3); + void error0(ErrorCode e); + void error1(ErrorCode e, AST_Decl *t); + void error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2); + void error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3); // Report a syntax error in IDL input - void syntax_error(IDL_GlobalData::ParseState ps); + void syntax_error(IDL_GlobalData::ParseState ps); // Report a name being used with different spellings - void name_case_error(char *n, char *t); + void name_case_error(char *n, char *t); // Report an unsuccesful coercion attempt - void coercion_error(AST_Expression *v, AST_Expression::ExprType t); + void coercion_error(AST_Expression *v, AST_Expression::ExprType t); // Report a failed name lookup attempt - void lookup_error(UTL_ScopedName *n); + void lookup_error(UTL_ScopedName *n); // Report an attempt to use a forward declared interface which // hasn't been defined yet in an inheritance spec - void inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f); + void inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f); // Report an attempt to inherit from something other than an interface - void inheritance_error(UTL_ScopedName *n, AST_Decl *d); + void inheritance_error(UTL_ScopedName *n, AST_Decl *d); // Report an error while evaluating an expression (division by zero, etc.) - void eval_error(AST_Expression *d); + void eval_error(AST_Expression *d); // Report a situation where a constant was expected but we got // something else instead. This most likely is a case where a union // label did not evaluate to a constant - void constant_expected(UTL_ScopedName *n, AST_Decl *d); + void constant_expected(UTL_ScopedName *n, AST_Decl *d); // Report a situation where an enumerator was expected but we got // something else instead. This occurs when a union with an enum // discriminator is being parsed and one of the branch labels is // not an enumerator in that enum - void enum_val_expected(AST_Union *t, AST_UnionLabel *l); + void enum_val_expected(AST_Union *t, AST_UnionLabel *l); // Report a failed enumerator lookup in an enum - void enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n); + void enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n); // Report an ambiguous name definition - void ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d); + void ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d); // Report a forward declared interface which was never defined - void fwd_decl_not_defined(AST_Interface *d); + void fwd_decl_not_defined(AST_Interface *d); // Report attempt to lookup in forward declared interface - void fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n); + void fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n); // Report a redefinition in scope - void redefinition_in_scope(AST_Decl *t, AST_Decl *s); + void redefinition_in_scope(AST_Decl *t, AST_Decl *s); // Report not a type error - void not_a_type(AST_Decl *d); + void not_a_type(AST_Decl *d); // Report back-end error void back_end(long lineno, String *s); diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h index 821efe648d2..7d726039fb0 100644 --- a/TAO/TAO_IDL/include/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_exceptlist.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: utl_list.hh, ast_exception.hh @@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_ExceptList : public UTL_List +class UTL_ExceptList : public UTL_List { public: // Operations @@ -98,15 +98,15 @@ public: UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr); // Get list item - AST_Exception *head(); + AST_Exception *head(); private: // Data - AST_Exception *pd_car_data; // Item of this list + AST_Exception *pd_car_data; // Item of this list }; // Active iterator for UTL_ExceptList -class UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator +class UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator { public: // Operations @@ -115,7 +115,7 @@ public: UTL_ExceptlistActiveIterator(UTL_ExceptList *s); // Get current item - AST_Exception *item(); + AST_Exception *item(); }; #endif // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h index d113b23109e..934bdca15e1 100644 --- a/TAO/TAO_IDL/include/utl_exprlist.h +++ b/TAO/TAO_IDL/include/utl_exprlist.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: ast_expression.hh, utl_list.hh @@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_ExprList : public UTL_List +class UTL_ExprList : public UTL_List { public: // Operations @@ -98,15 +98,15 @@ public: UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr); // Get list item - AST_Expression *head(); + AST_Expression *head(); private: // Data - AST_Expression *pd_car_data; // List item + AST_Expression *pd_car_data; // List item }; // Active iterator for UTL_ExprList -class UTL_ExprlistActiveIterator : public UTL_ListActiveIterator +class UTL_ExprlistActiveIterator : public UTL_ListActiveIterator { public: // Operations @@ -115,7 +115,7 @@ public: UTL_ExprlistActiveIterator(UTL_ExprList *s); // Get current item - AST_Expression *item(); + AST_Expression *item(); }; #endif // _UTL_EXPRLIST_UTL_EXPRLIST_HH diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h index 392ee7e58e5..bf9739732f0 100644 --- a/TAO/TAO_IDL/include/utl_identifier.h +++ b/TAO/TAO_IDL/include/utl_identifier.h @@ -64,8 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -#ifndef _UTL_IDENTIFIER_UTL_IDENTIFIER_HH -#define _UTL_IDENTIFIER_UTL_IDENTIFIER_HH +#ifndef _UTL_IDENTIFIER_UTL_IDENTIFIER_HH +#define _UTL_IDENTIFIER_UTL_IDENTIFIER_HH // utl_identifier.hh // @@ -77,8 +77,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -#include "idl_fwd.h" -#include "utl_string.h" +#include "idl_fwd.h" +#include "utl_string.h" class Identifier { @@ -94,20 +94,20 @@ public: // =Operations - char *get_string (); + char *get_string (); // get the underlying string - long compare (Identifier *other); + long compare (Identifier *other); // compare with other Identifier // =Dumping - virtual void dump (ostream &o); + virtual void dump (ostream &o); // dump to an ostream private: // Storage for data - char *pv_string; + char *pv_string; }; -#endif // _UTL_IDENTIFIER_UTL_IDENTIFIER_HH +#endif // _UTL_IDENTIFIER_UTL_IDENTIFIER_HH diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h index 211836af42e..dc0ed8c0c04 100644 --- a/TAO/TAO_IDL/include/utl_idlist.h +++ b/TAO/TAO_IDL/include/utl_idlist.h @@ -64,8 +64,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ -#ifndef _UTL_IDLIST_UTL_IDLIST_HH -#define _UTL_IDLIST_UTL_IDLIST_HH +#ifndef _UTL_IDLIST_UTL_IDLIST_HH +#define _UTL_IDLIST_UTL_IDLIST_HH // utl_idlist.hh // @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: utl_list.hh, utl_identifier.hh @@ -89,10 +89,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_identifier.h" -#include "utl_string.h" +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_identifier.h" +#include "utl_string.h" class UTL_IdList : public UTL_List { @@ -129,8 +129,8 @@ private: // Active iterator for UTL_IdList -class UTL_IdListActiveIterator : - public UTL_ListActiveIterator +class UTL_IdListActiveIterator : + public UTL_ListActiveIterator { // =TITLE // UTL_IdListActiveIterator @@ -144,4 +144,4 @@ public: // retrieves the next item }; -#endif // _UTL_IDLIST_UTL_IDLIST_HH +#endif // _UTL_IDLIST_UTL_IDLIST_HH diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h index 29c8c587f00..c72291eaf92 100644 --- a/TAO/TAO_IDL/include/utl_indenter.h +++ b/TAO/TAO_IDL/include/utl_indenter.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -88,22 +88,22 @@ class UTL_Indenter public: // Operations - UTL_Indenter(); // constructor + UTL_Indenter(); // constructor // Constructor(s) virtual ~UTL_Indenter() {} // destructor - void reset(); + void reset(); // Reset indentation level to 0 - void increase(); + void increase(); // Increase indentation level - void decrease(); + void decrease(); // Decrease indentation level - void skip_to (ostream &o); + void skip_to (ostream &o); // Skip to indentation level stop void skip_to (FILE *fp); @@ -111,7 +111,7 @@ public: private: // Data - long pd_indent_level; // How far to indent + long pd_indent_level; // How far to indent }; #endif // _UTL_INDENTER_UTL_INDENTER_HH diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h index e3410e34623..0ad12eef9d6 100644 --- a/TAO/TAO_IDL/include/utl_labellist.h +++ b/TAO/TAO_IDL/include/utl_labellist.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: utl_list.hh, ast_union_label.hh @@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_LabelList : public UTL_List +class UTL_LabelList : public UTL_List { public: // Operations @@ -98,15 +98,15 @@ public: UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr); // Get list item - AST_UnionLabel *head(); + AST_UnionLabel *head(); private: // Data - AST_UnionLabel *pd_car_data; // List item + AST_UnionLabel *pd_car_data; // List item }; // Active iterator for UTL_LabelList -class UTL_LabellistActiveIterator : public UTL_ListActiveIterator +class UTL_LabellistActiveIterator : public UTL_ListActiveIterator { public: // Operations @@ -115,7 +115,7 @@ public: UTL_LabellistActiveIterator(UTL_LabelList *source); // Get current item - AST_UnionLabel *item(); + AST_UnionLabel *item(); }; #endif // _UTL_LABELLIST_UTL_LABELLIST_HH diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h index 0c113ab9fbc..fa657f70e77 100644 --- a/TAO/TAO_IDL/include/utl_list.h +++ b/TAO/TAO_IDL/include/utl_list.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -79,20 +79,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. // Forward declare active iterator for UTL_List -class UTL_ListActiveIterator; +class UTL_ListActiveIterator; -class UTL_List +class UTL_List { public: // Operations @@ -101,50 +101,50 @@ public: UTL_List(UTL_List *c); // Smash last cdr pointer in "this" with l - void nconc(UTL_List *l); + void nconc(UTL_List *l); // Copy the list starting at "this" - virtual UTL_List *copy(); + virtual UTL_List *copy(); // Get next list - UTL_List *tail(); + UTL_List *tail(); // Set next list - void set_tail(UTL_List *l); + void set_tail(UTL_List *l); // How long is this list? - long length(); + long length(); private: // Data - UTL_List *pd_cdr_data; // The next list + UTL_List *pd_cdr_data; // The next list // Operations - long list_length(long n); // How long is it? + long list_length(long n); // How long is it? // Friend class - friend class UTL_ListActiveIterator; // Friend class + friend class UTL_ListActiveIterator; // Friend class }; // Active iterator for lists -class UTL_ListActiveIterator +class UTL_ListActiveIterator { public: // Operations // Constructor(s) - UTL_ListActiveIterator(UTL_List *s); + UTL_ListActiveIterator(UTL_List *s); // Get next list - virtual void next(); + virtual void next(); // Are we at the end of this list? - virtual long is_done(); + virtual long is_done(); protected: // Data - UTL_List *source; // On what to iterate? + UTL_List *source; // On what to iterate? }; #endif // _UTL_LIST_UTL_LIST_HH diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h index 3b9be0bc45a..f962882425f 100644 --- a/TAO/TAO_IDL/include/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_namelist.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: utl_list.hh, utl_scoped_name.hh @@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_NameList : public UTL_List +class UTL_NameList : public UTL_List { public: // Operations @@ -98,15 +98,15 @@ public: UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr); // Get list item - UTL_ScopedName *head(); + UTL_ScopedName *head(); private: // Data - UTL_ScopedName *pd_car_data; // List item + UTL_ScopedName *pd_car_data; // List item }; // Active iterator for UTL_NameList -class UTL_NamelistActiveIterator : public UTL_ListActiveIterator +class UTL_NamelistActiveIterator : public UTL_ListActiveIterator { public: // Operations @@ -115,7 +115,7 @@ public: UTL_NamelistActiveIterator(UTL_NameList *source); // Get current item - UTL_ScopedName *item(); + UTL_ScopedName *item(); }; #endif // _UTL_NAMELIST_UTL_NAMELIST_HH diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index ce94d12574f..e4102d5bb06 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -89,23 +89,23 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -#include "idl_fwd.h" -#include "idl_narrow.h" -#include "ast_decl.h" -#include "ast_expression.h" -#include "utl_scoped_name.h" +#include "idl_fwd.h" +#include "idl_narrow.h" +#include "ast_decl.h" +#include "ast_expression.h" +#include "utl_scoped_name.h" // Forward declaration of active iterator for UTL_Scope class UTL_ScopeActiveIterator; -class UTL_Scope : public virtual COMMON_Base +class UTL_Scope : public virtual COMMON_Base { public: // Enum to denote the kind of iteration desired enum ScopeIterationKind { - IK_both // Iterate through both decls and local types - , IK_decls // Iterate only through decls - , IK_localtypes // Iterate only through local types + IK_both // Iterate through both decls and local types + , IK_decls // Iterate only through decls + , IK_localtypes // Iterate only through local types }; // Operations @@ -116,31 +116,31 @@ public: virtual ~UTL_Scope() {} // Scope Management Protocol - virtual AST_PredefinedType *add_predefined_type(AST_PredefinedType *t); - virtual AST_Module *add_module(AST_Module *m); - virtual AST_Interface *add_interface(AST_Interface *i); - virtual AST_InterfaceFwd *add_interface_fwd(AST_InterfaceFwd *i); - virtual AST_Constant *add_constant(AST_Constant *c); - virtual AST_Exception *add_exception(AST_Exception *e); - virtual AST_Attribute *add_attribute(AST_Attribute *a); - virtual AST_Operation *add_operation(AST_Operation *o); - virtual AST_Argument *add_argument(AST_Argument *a); - virtual AST_Union *add_union(AST_Union *u); - virtual AST_UnionBranch *add_union_branch(AST_UnionBranch *b); - virtual AST_Structure *add_structure(AST_Structure *s); - virtual AST_Field *add_field(AST_Field *f); - virtual AST_Enum *add_enum(AST_Enum *e); - virtual AST_EnumVal *add_enum_val(AST_EnumVal *v); - virtual AST_Typedef *add_typedef(AST_Typedef *t); - virtual UTL_StrList *add_context(UTL_StrList *c); - virtual UTL_NameList *add_exceptions(UTL_NameList *e); - virtual AST_Sequence *add_sequence(AST_Sequence *s); - virtual AST_String *add_string(AST_String *s); - virtual AST_Array *add_array(AST_Array *a); + virtual AST_PredefinedType *add_predefined_type(AST_PredefinedType *t); + virtual AST_Module *add_module(AST_Module *m); + virtual AST_Interface *add_interface(AST_Interface *i); + virtual AST_InterfaceFwd *add_interface_fwd(AST_InterfaceFwd *i); + virtual AST_Constant *add_constant(AST_Constant *c); + virtual AST_Exception *add_exception(AST_Exception *e); + virtual AST_Attribute *add_attribute(AST_Attribute *a); + virtual AST_Operation *add_operation(AST_Operation *o); + virtual AST_Argument *add_argument(AST_Argument *a); + virtual AST_Union *add_union(AST_Union *u); + virtual AST_UnionBranch *add_union_branch(AST_UnionBranch *b); + virtual AST_Structure *add_structure(AST_Structure *s); + virtual AST_Field *add_field(AST_Field *f); + virtual AST_Enum *add_enum(AST_Enum *e); + virtual AST_EnumVal *add_enum_val(AST_EnumVal *v); + virtual AST_Typedef *add_typedef(AST_Typedef *t); + virtual UTL_StrList *add_context(UTL_StrList *c); + virtual UTL_NameList *add_exceptions(UTL_NameList *e); + virtual AST_Sequence *add_sequence(AST_Sequence *s); + virtual AST_String *add_string(AST_String *s); + virtual AST_Array *add_array(AST_Array *a); virtual AST_Native *add_native (AST_Native *n); // Call back end add_XXX functions for this scope - virtual AST_Decl *call_add(); + virtual AST_Decl *call_add(); // Data Accessors AST_Decl::NodeType scope_node_type() @@ -153,24 +153,24 @@ public: DEF_NARROW_FROM_SCOPE(UTL_Scope); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); // Other Operations // Name Lookup Mechanism - virtual AST_Decl *lookup_by_name(UTL_ScopedName *, - idl_bool treat_as_ref); + virtual AST_Decl *lookup_by_name(UTL_ScopedName *, + idl_bool treat_as_ref); // Look up the Identifier * specified only in the local scope - virtual AST_Decl *lookup_by_name_local(Identifier *, - idl_bool treat_as_ref); + virtual AST_Decl *lookup_by_name_local(Identifier *, + idl_bool treat_as_ref); // Look up a predefined type by its ExprType virtual AST_Decl *lookup_primitive_type(AST_Expression::ExprType); // How many entries are used? - virtual unsigned long nmembers(); + virtual unsigned long nmembers(); protected: // UTL_Scope protected addition protocol. This protocol is @@ -180,81 +180,81 @@ protected: // defined elsewhere were referenced in this scope // Add to decls. Node represents a local declaration - void add_to_scope(AST_Decl *e); + void add_to_scope(AST_Decl *e); // Add to local types. Node represents a local manifest type - void add_to_local_types(AST_Decl *e); + void add_to_local_types(AST_Decl *e); // Add to referenced nodes set. - void add_to_referenced(AST_Decl *e, - idl_bool recursive); + void add_to_referenced(AST_Decl *e, + idl_bool recursive); // Has this node been referenced here already? - idl_bool referenced(AST_Decl *e); + idl_bool referenced(AST_Decl *e); // Look up a scoped name in the inherited interfaces of an // interface - virtual AST_Decl *look_in_inherited(UTL_ScopedName *, - idl_bool treat_as_ref); + virtual AST_Decl *look_in_inherited(UTL_ScopedName *, + idl_bool treat_as_ref); protected: // Operations // Lookup based on the local name - virtual AST_Decl *lookup_for_add(AST_Decl *d, - idl_bool treat_as_ref); + virtual AST_Decl *lookup_for_add(AST_Decl *d, + idl_bool treat_as_ref); private: // Data // What type is this node? This is a cache of the information // in AST_Decl - const AST_Decl::NodeType pd_scope_node_type; + const AST_Decl::NodeType pd_scope_node_type; // Storage for declarations in this scope: - AST_Decl **pd_decls; // Store declarations - long pd_decls_allocated; // How many allocated? - long pd_decls_used; // How many used? + AST_Decl **pd_decls; // Store declarations + long pd_decls_allocated; // How many allocated? + long pd_decls_used; // How many used? // Storage for local manifest types in this scope: - AST_Decl **pd_local_types; // Store types - long pd_locals_allocated; // How many allocated? - long pd_locals_used; // How many used? + AST_Decl **pd_local_types; // Store types + long pd_locals_allocated; // How many allocated? + long pd_locals_used; // How many used? // Storage for referenced nodes in this scope: - AST_Decl **pd_referenced; // Store references - long pd_referenced_allocated;// How many allocated? - long pd_referenced_used; // How many used? + AST_Decl **pd_referenced; // Store references + long pd_referenced_allocated;// How many allocated? + long pd_referenced_used; // How many used? // Friend class UTL_ScopeActiveIterator defines active iterator for // UTL_Scope. Definition follows below. - friend class UTL_ScopeActiveIterator; + friend class UTL_ScopeActiveIterator; private: friend int tao_yyparse(); friend class AST_Enum; // Scope Management Protocol - virtual AST_PredefinedType *fe_add_predefined_type(AST_PredefinedType *t); - virtual AST_Module *fe_add_module(AST_Module *m); - virtual AST_Interface *fe_add_interface(AST_Interface *i); - virtual AST_InterfaceFwd *fe_add_interface_fwd(AST_InterfaceFwd *i); - virtual AST_Constant *fe_add_constant(AST_Constant *c); - virtual AST_Exception *fe_add_exception(AST_Exception *e); - virtual AST_Attribute *fe_add_attribute(AST_Attribute *a); - virtual AST_Operation *fe_add_operation(AST_Operation *o); - virtual AST_Argument *fe_add_argument(AST_Argument *a); - virtual AST_Union *fe_add_union(AST_Union *u); - virtual AST_UnionBranch *fe_add_union_branch(AST_UnionBranch *b); - virtual AST_Structure *fe_add_structure(AST_Structure *s); - virtual AST_Field *fe_add_field(AST_Field *f); - virtual AST_Enum *fe_add_enum(AST_Enum *e); - virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); - virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); - virtual UTL_StrList *fe_add_context(UTL_StrList *c); - virtual UTL_NameList *fe_add_exceptions(UTL_NameList *e); - virtual AST_Sequence *fe_add_sequence(AST_Sequence *s); - virtual AST_String *fe_add_string(AST_String *s); - virtual AST_Array *fe_add_array(AST_Array *a); + virtual AST_PredefinedType *fe_add_predefined_type(AST_PredefinedType *t); + virtual AST_Module *fe_add_module(AST_Module *m); + virtual AST_Interface *fe_add_interface(AST_Interface *i); + virtual AST_InterfaceFwd *fe_add_interface_fwd(AST_InterfaceFwd *i); + virtual AST_Constant *fe_add_constant(AST_Constant *c); + virtual AST_Exception *fe_add_exception(AST_Exception *e); + virtual AST_Attribute *fe_add_attribute(AST_Attribute *a); + virtual AST_Operation *fe_add_operation(AST_Operation *o); + virtual AST_Argument *fe_add_argument(AST_Argument *a); + virtual AST_Union *fe_add_union(AST_Union *u); + virtual AST_UnionBranch *fe_add_union_branch(AST_UnionBranch *b); + virtual AST_Structure *fe_add_structure(AST_Structure *s); + virtual AST_Field *fe_add_field(AST_Field *f); + virtual AST_Enum *fe_add_enum(AST_Enum *e); + virtual AST_EnumVal *fe_add_enum_val(AST_EnumVal *v); + virtual AST_Typedef *fe_add_typedef(AST_Typedef *t); + virtual UTL_StrList *fe_add_context(UTL_StrList *c); + virtual UTL_NameList *fe_add_exceptions(UTL_NameList *e); + virtual AST_Sequence *fe_add_sequence(AST_Sequence *s); + virtual AST_String *fe_add_string(AST_String *s); + virtual AST_Array *fe_add_array(AST_Array *a); virtual AST_Native *fe_add_native (AST_Native *n); }; @@ -267,26 +267,26 @@ public: UTL_ScopeActiveIterator(UTL_Scope *s, UTL_Scope::ScopeIterationKind ik); // Advance to next item - virtual void next(); + virtual void next(); // Get current item - virtual AST_Decl *item(); + virtual AST_Decl *item(); // Have we iterated over entire scope? - virtual idl_bool is_done(); + virtual idl_bool is_done(); // What kind of iterator is this? - virtual UTL_Scope::ScopeIterationKind iteration_kind(); + virtual UTL_Scope::ScopeIterationKind iteration_kind(); // What stage are we in with this iterator? - virtual UTL_Scope::ScopeIterationKind iteration_stage(); + virtual UTL_Scope::ScopeIterationKind iteration_stage(); private: // Data - UTL_Scope *iter_source; // Scope to iterate over - UTL_Scope::ScopeIterationKind ik; // What kind of iteration - UTL_Scope::ScopeIterationKind stage; // What stage - long il; // What location in stage + UTL_Scope *iter_source; // Scope to iterate over + UTL_Scope::ScopeIterationKind ik; // What kind of iteration + UTL_Scope::ScopeIterationKind stage; // What stage + long il; // What location in stage }; #endif // _UTL_SCOPE_UTL_SCOPE_HH diff --git a/TAO/TAO_IDL/include/utl_scoped_name.h b/TAO/TAO_IDL/include/utl_scoped_name.h index 5a3145e669b..2cdc381bf2f 100644 --- a/TAO/TAO_IDL/include/utl_scoped_name.h +++ b/TAO/TAO_IDL/include/utl_scoped_name.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -75,8 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from ast.hh */ -typedef UTL_IdList UTL_ScopedName; +typedef UTL_IdList UTL_ScopedName; -typedef UTL_IdListActiveIterator UTL_ScopedNameActiveIterator; +typedef UTL_IdListActiveIterator UTL_ScopedNameActiveIterator; #endif // _AST_SCOPED_NAME_AST_SCOPED_NAME_HH diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h index 9d4224cde4c..eb8b2cf8b46 100644 --- a/TAO/TAO_IDL/include/utl_stack.h +++ b/TAO/TAO_IDL/include/utl_stack.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -78,9 +78,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ // Forward declaration of active iterator for UTL_ScopeStack -class UTL_ScopeStackActiveIterator; +class UTL_ScopeStackActiveIterator; -class UTL_ScopeStack +class UTL_ScopeStack { public: // Operations @@ -90,41 +90,41 @@ public: virtual ~UTL_ScopeStack(); // Return top element - virtual UTL_Scope *top(); + virtual UTL_Scope *top(); // Pop top element - virtual void pop(); + virtual void pop(); // Clear entire stack - virtual void clear(); + virtual void clear(); // Push an element on the stack and return stack - virtual UTL_ScopeStack *push(UTL_Scope *el); + virtual UTL_ScopeStack *push(UTL_Scope *el); // How deep is the stack now? - virtual unsigned long depth(); + virtual unsigned long depth(); // Return bottom element - virtual UTL_Scope *bottom(); + virtual UTL_Scope *bottom(); // Return (top - 1) element - virtual UTL_Scope *next_to_top(); + virtual UTL_Scope *next_to_top(); // return topmost non-NULL element - virtual UTL_Scope *top_non_null(); + virtual UTL_Scope *top_non_null(); private: // Data - UTL_Scope **pd_stack_data; // Store scopes stack - unsigned long pd_stack_data_nalloced; // How many allocated? - unsigned long pd_stack_top; // How many used? + UTL_Scope **pd_stack_data; // Store scopes stack + unsigned long pd_stack_data_nalloced; // How many allocated? + unsigned long pd_stack_top; // How many used? // Friend active iterator class for UTL_ScopeStack - friend class UTL_ScopeStackActiveIterator; + friend class UTL_ScopeStackActiveIterator; }; // Active iterator for UTL_ScopeStack -class UTL_ScopeStackActiveIterator +class UTL_ScopeStackActiveIterator { public: // Operations @@ -133,18 +133,18 @@ public: UTL_ScopeStackActiveIterator(UTL_ScopeStack *s); // Advance to next element - virtual void next(); + virtual void next(); // Get current item - virtual UTL_Scope *item(); + virtual UTL_Scope *item(); // Is the iteration finished? - virtual long is_done(); + virtual long is_done(); private: // Data - UTL_ScopeStack *source; // On what to iterate? - long il; // Where are we in iteration? + UTL_ScopeStack *source; // On what to iterate? + long il; // Where are we in iteration? }; #endif // _UTL_STACK_UTL_STACK_HH diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 0db31bd2bf6..de6516b7849 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -76,10 +76,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ #ifndef String -#define String UTL_String -#endif // String +#define String UTL_String +#endif // String -class UTL_String +class UTL_String { // =TITLE // UTL_String @@ -101,7 +101,7 @@ public: // construct using a pointer to UTL_String virtual ~UTL_String (void) {} - // destructor + // destructor // =AST Dumping @@ -122,21 +122,21 @@ public: private: // Data - char *p_str; + char *p_str; // Storage for characters - char *c_str; + char *c_str; // Canonicalized string - unsigned long len; + unsigned long len; // How long is string - unsigned long alloced; + unsigned long alloced; // How much allocated // =Private helper operations - void canonicalize (void); + void canonicalize (void); // Compute canonical representation }; diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index 5806cb57785..99213ed50e3 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. -SunSoft, Inc. -2550 Garcia Avenue +SunSoft, Inc. +2550 Garcia Avenue Mountain View, California 94043 NOTE: @@ -73,15 +73,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // NOTE: This list class only works correctly because we use single public // inheritance, as opposed to multiple inheritance or public virtual. -// It relies on a type-unsafe cast from UTL_List to subclasses, which -// will cease to operate correctly if you use either multiple or -// public virtual inheritance. +// It relies on a type-unsafe cast from UTL_List to subclasses, which +// will cease to operate correctly if you use either multiple or +// public virtual inheritance. // -// For portability reasons we have decided to provide both this and -// an implementation of the list classes in terms of templates. If -// your compiler supports templates, please use the files in the -// include/utl_tmpl and util/utl_tmpl directories instead of the -// files by the same names in the include and util directories. +// For portability reasons we have decided to provide both this and +// an implementation of the list classes in terms of templates. If +// your compiler supports templates, please use the files in the +// include/utl_tmpl and util/utl_tmpl directories instead of the +// files by the same names in the include and util directories. /* ** DEPENDENCIES: utl_list.hh, utl_string.hh @@ -89,7 +89,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. ** USE: Included from util.hh */ -class UTL_StrList : public UTL_List +class UTL_StrList : public UTL_List { public: // Operations @@ -98,29 +98,29 @@ public: UTL_StrList(String *s, UTL_StrList *cdr); // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); // Other Operations // Copy a list of strings - virtual UTL_List *copy(); + virtual UTL_List *copy(); // Get list element - String *head(); + String *head(); // Set the list element - void set_head(String *); + void set_head(String *); // Get last element in this list - String *last_component(); + String *last_component(); private: // Data - String *pd_car_data; // The list item + String *pd_car_data; // The list item }; // Active iterator for UTL_StrList -class UTL_StrlistActiveIterator : public UTL_ListActiveIterator +class UTL_StrlistActiveIterator : public UTL_ListActiveIterator { public: // Operations @@ -129,7 +129,7 @@ public: UTL_StrlistActiveIterator(UTL_StrList *s); // Get current item - String *item(); + String *item(); }; #endif // _UTL_STRLIST_UTL_STRLIST_HH diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h index 63247a10df2..8de08c85725 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -65,17 +65,22 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_idlist.h" -#include "utl_scoped_name.h" -#include "utl_identifier.h" -#include "utl_string.h" -#include "fe_declarator.h" +#include "ace/stdcpp.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -class UTL_DeclList : public UTL_List<UTL_DeclList, FE_Declarator> +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_idlist.h" +#include "utl_scoped_name.h" +#include "utl_identifier.h" +#include "utl_string.h" +#include "fe_declarator.h" + + +class UTL_DeclList : public UTL_List<UTL_DeclList, FE_Declarator> { public: // Operations @@ -86,7 +91,7 @@ public: }; // Active iterator for UTL_DeclList -class UTL_DecllistActiveIterator : +class UTL_DecllistActiveIterator : public UTL_ListActiveIterator<UTL_DeclList, FE_Declarator> { public: diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h index a709776a875..8fee4504360 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -65,25 +65,30 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_strlist.h" -#include "utl_idlist.h" -#include "utl_scoped_name.h" -#include "utl_identifier.h" -#include "utl_string.h" -#include "ast_expression.h" -#include "idl_bool.h" -#include "utl_scope.h" -#include "ast_decl.h" -#include "ast_type.h" -#include "ast_concrete_type.h" -#include "ast_structure.h" -#include "ast_exception.h" +#include "ace/stdcpp.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -class UTL_ExceptList : public UTL_List<UTL_ExceptList, AST_Exception> +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_strlist.h" +#include "utl_idlist.h" +#include "utl_scoped_name.h" +#include "utl_identifier.h" +#include "utl_string.h" +#include "ast_expression.h" +#include "idl_bool.h" +#include "utl_scope.h" +#include "ast_decl.h" +#include "ast_type.h" +#include "ast_concrete_type.h" +#include "ast_structure.h" +#include "ast_exception.h" + + +class UTL_ExceptList : public UTL_List<UTL_ExceptList, AST_Exception> { public: // Operations @@ -94,7 +99,7 @@ public: }; // Active iterator for UTL_ExceptList -class UTL_ExceptlistActiveIterator : +class UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator<UTL_ExceptList, AST_Exception> { public: diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h index 5215ae18362..84fbcd3957c 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -65,18 +65,23 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_strlist.h" -#include "utl_idlist.h" -#include "utl_scoped_name.h" -#include "utl_identifier.h" -#include "utl_string.h" -#include "ast_expression.h" +#include "ace/stdcpp.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -class UTL_ExprList : public UTL_List<UTL_ExprList, AST_Expression> +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_strlist.h" +#include "utl_idlist.h" +#include "utl_scoped_name.h" +#include "utl_identifier.h" +#include "utl_string.h" +#include "ast_expression.h" + + +class UTL_ExprList : public UTL_List<UTL_ExprList, AST_Expression> { public: // Operations @@ -87,7 +92,7 @@ public: }; // Active iterator for UTL_ExprList -class UTL_ExprlistActiveIterator : +class UTL_ExprlistActiveIterator : public UTL_ListActiveIterator<UTL_ExprList, AST_Expression> { public: diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h index a08bac915b6..a9a1b77c26d 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -52,8 +52,8 @@ *====================================================================== */ -#ifndef _UTL_IDLIST_UTL_IDLIST_HH -#define _UTL_IDLIST_UTL_IDLIST_HH +#ifndef _UTL_IDLIST_UTL_IDLIST_HH +#define _UTL_IDLIST_UTL_IDLIST_HH // utl_idlist.hh // @@ -65,13 +65,18 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_identifier.h" -#include "utl_string.h" +#include "ace/stdcpp.h" -class UTL_IdList : public UTL_List<UTL_IdList, Identifier> +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_identifier.h" +#include "utl_string.h" + +class UTL_IdList : public UTL_List<UTL_IdList, Identifier> { public: // Constructor(s) @@ -79,22 +84,22 @@ class UTL_IdList : public UTL_List<UTL_IdList, Identifier> virtual ~UTL_IdList() {} // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); // Other operations // Get last element in this list - Identifier *last_component(); + Identifier *last_component(); }; // Active iterator for UTL_IdList -class UTL_IdListActiveIterator : - public UTL_ListActiveIterator<UTL_IdList, Identifier> +class UTL_IdListActiveIterator : + public UTL_ListActiveIterator<UTL_IdList, Identifier> { public: // Constructor(s) UTL_IdListActiveIterator(UTL_IdList *s); }; -#endif // _UTL_IDLIST_UTL_IDLIST_HH +#endif // _UTL_IDLIST_UTL_IDLIST_HH diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h index e9c38823e31..b7ca1d38e43 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -65,13 +65,18 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "ast_union_label.h" +#include "ace/stdcpp.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -class UTL_LabelList : public UTL_List<UTL_LabelList, AST_UnionLabel> +#include "idl_fwd.h" +#include "utl_list.h" +#include "ast_union_label.h" + + +class UTL_LabelList : public UTL_List<UTL_LabelList, AST_UnionLabel> { public: // Operations @@ -82,7 +87,7 @@ public: }; // Active iterator for UTL_LabelList -class UTL_LabellistActiveIterator : +class UTL_LabellistActiveIterator : public UTL_ListActiveIterator<UTL_LabelList, AST_UnionLabel> { public: diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h index 8bc8c4035a6..b300298b93d 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -69,7 +69,7 @@ template<class L, class T> class UTL_ListActiveIterator; template<class L, class T> -class UTL_List +class UTL_List { public: // Operations @@ -79,62 +79,62 @@ public: virtual ~UTL_List() {} // Smash last cdr pointer in "this" with l - void nconc(L *l); + void nconc(L *l); // Copy the list starting at "this" - L *copy(); + L *copy(); // Get list element - T *head(); + T *head(); // Get next list - L *tail(); + L *tail(); // Set the list element - void set_head(T *t); + void set_head(T *t); // Set next list - void set_tail(L *l); + void set_tail(L *l); // How long is this list? - long length(); + long length(); private: // Data - T *pd_car_data; // The next list - L *pd_cdr_data; // The next list + T *pd_car_data; // The next list + L *pd_cdr_data; // The next list // Operations - long list_length(long n); // How long is it? + long list_length(long n); // How long is it? // Friend class - friend class UTL_ListActiveIterator<L, T>; // Friend class + friend class UTL_ListActiveIterator<L, T>; // Friend class }; // Active iterator for lists template<class L, class T> -class UTL_ListActiveIterator +class UTL_ListActiveIterator { public: // Operations // Constructor(s) - UTL_ListActiveIterator(UTL_List<L, T> *s); + UTL_ListActiveIterator(UTL_List<L, T> *s); virtual ~UTL_ListActiveIterator() {} // Get current item - T *item(); + T *item(); // Get next list - virtual void next(); + virtual void next(); // Are we at the end of this list? - virtual long is_done(); + virtual long is_done(); protected: // Data - UTL_List<L, T> *source; // On what to iterate? + UTL_List<L, T> *source; // On what to iterate? }; #endif // _UTL_LIST_UTL_LIST_HH diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h index ff8f23ff45c..bd79687f222 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -65,15 +65,20 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_idlist.h" -#include "utl_scoped_name.h" -#include "utl_identifier.h" -#include "utl_string.h" +#include "ace/stdcpp.h" -class UTL_NameList : public UTL_List<UTL_NameList, UTL_ScopedName> +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_idlist.h" +#include "utl_scoped_name.h" +#include "utl_identifier.h" +#include "utl_string.h" + +class UTL_NameList : public UTL_List<UTL_NameList, UTL_ScopedName> { public: // Operations @@ -84,7 +89,7 @@ public: }; // Active iterator for UTL_NameList -class UTL_NamelistActiveIterator : +class UTL_NamelistActiveIterator : public UTL_ListActiveIterator<UTL_NameList, UTL_ScopedName> { public: diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h index 2b6966d0b01..2bdfe06b847 100644 --- a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h @@ -42,8 +42,8 @@ *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE *POSSIBILITY OF SUCH DAMAGES. * - *SunSoft, Inc. - *2550 Garcia Avenue + *SunSoft, Inc. + *2550 Garcia Avenue *Mountain View, California 94043 * * @@ -65,13 +65,18 @@ ** USE: Included from util.hh */ -#include "ace/stdcpp.h" -#include "idl_fwd.h" -#include "utl_list.h" -#include "utl_string.h" +#include "ace/stdcpp.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -class UTL_StrList : public UTL_List<UTL_StrList, String> +#include "idl_fwd.h" +#include "utl_list.h" +#include "utl_string.h" + + +class UTL_StrList : public UTL_List<UTL_StrList, String> { public: // Operations @@ -81,16 +86,16 @@ public: virtual ~UTL_StrList() {} // AST Dumping - virtual void dump(ostream &o); + virtual void dump(ostream &o); // Other Operations // Get last element in this list - String *last_component(); + String *last_component(); }; // Active iterator for UTL_StrList -class UTL_StrlistActiveIterator : +class UTL_StrlistActiveIterator : public UTL_ListActiveIterator<UTL_StrList, String> { public: |