diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
| commit | 0902828269fb1a42ed23c208fd61bac76aaddc13 (patch) | |
| tree | 5967e9ca7d44ed1d2823be9746817ebb8e025f5d /TAO/tao | |
| parent | e7788cff873f30e65d44d38db7cfafc175f748a3 (diff) | |
| download | ATCD-0902828269fb1a42ed23c208fd61bac76aaddc13.tar.gz | |
changed include protection from #if !defined to ifndef, and added #pragma once, if possible
Diffstat (limited to 'TAO/tao')
44 files changed, 749 insertions, 707 deletions
diff --git a/TAO/tao/Align.h b/TAO/tao/Align.h index 6f5d4e67504..f1b75a7c0b5 100644 --- a/TAO/tao/Align.h +++ b/TAO/tao/Align.h @@ -49,7 +49,7 @@ typedef u_long long ptr_arith_t; // Since the alignment is a power of two its binary representation is: // alignment = 0...010...0 // -// hence +// hence // // alignment - 1 = 0...001...1 = T1 // @@ -57,7 +57,7 @@ typedef u_long long ptr_arith_t; // // ~(alignment - 1) = 1...110...0 = T2 // -// Notice that there is a multiple of <alignment> in the range +// Notice that there is a multiple of <alignment> in the range // [<value>,<value> + T1], also notice that if // // X = ( <value> + T1 ) & T2 @@ -69,7 +69,7 @@ typedef u_long long ptr_arith_t; // because the & operator only changes the last bits, and since X is a // multiple of <alignment> (its last bits are zero) we have found the // multiple we wanted. -// +// #define align_binary(ptr, alignment) \ ((ptr + ((ptr_arith_t)((alignment)-1))) & (~((ptr_arith_t)((alignment)-1)))) diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 4b70303ec7c..e26bc3387a7 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -140,27 +140,27 @@ public: // For reading from a output CDR stream. TAO_OutputCDR (size_t size = 0, - int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = - TAO_Marshal::DEFAULT_MARSHAL_FACTORY, - ACE_Allocator* buffer_allocator = 0, - ACE_Allocator* data_block_allocator = 0); + int byte_order = TAO_ENCAP_BYTE_ORDER, + TAO_Marshal_Factory *f = + TAO_Marshal::DEFAULT_MARSHAL_FACTORY, + ACE_Allocator* buffer_allocator = 0, + ACE_Allocator* data_block_allocator = 0); // Default constructor, allocates <size> bytes in the internal // buffer, if <size> == 0 it allocates the default size. TAO_OutputCDR (char *data, size_t size, - int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = - TAO_Marshal::DEFAULT_MARSHAL_FACTORY, - ACE_Allocator* buffer_allocator = 0, - ACE_Allocator* data_block_allocator = 0); + int byte_order = TAO_ENCAP_BYTE_ORDER, + TAO_Marshal_Factory *f = + TAO_Marshal::DEFAULT_MARSHAL_FACTORY, + ACE_Allocator* buffer_allocator = 0, + ACE_Allocator* data_block_allocator = 0); // Build a CDR stream with an initial buffer, it will *not* remove // <data>, since it did not allocated it. TAO_OutputCDR (ACE_Message_Block *data, - int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = - TAO_Marshal::DEFAULT_MARSHAL_FACTORY); + int byte_order = TAO_ENCAP_BYTE_ORDER, + TAO_Marshal_Factory *f = + TAO_Marshal::DEFAULT_MARSHAL_FACTORY); // Build a CDR stream with an initial Message_Block chain, it will *not* // remove <data>, since it did not allocate it. @@ -192,31 +192,31 @@ public: // Note: the portion written starts at <x> and ends at <x + length>. // The length is *NOT* stored into the CDR stream. CORBA_Boolean write_boolean_array (const CORBA::Boolean* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_char_array (const CORBA::Char* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_wchar_array (const CORBA::WChar* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_octet_array (const CORBA::Octet* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_short_array (const CORBA::Short* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_ushort_array (const CORBA::UShort* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_long_array (const CORBA::Long* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_ulong_array (const CORBA::ULong* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_longlong_array (const CORBA::LongLong* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_ulonglong_array (const CORBA::ULongLong* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_float_array (const CORBA::Float* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_double_array (const CORBA::Double* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_longdouble_array (const CORBA::LongDouble* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean write_octet_array_mb (const ACE_Message_Block* mb); // Write an octet array contained inside a MB, this can be optimized @@ -317,7 +317,7 @@ private: // operations using asignment. CORBA_Boolean write_array (const void* x, size_t size, size_t align, - CORBA::ULong length); + CORBA::ULong length); // write an array of <length> elements, each of <size> bytes and // the start aligned at a multiple of <align>. The elements are // assumed to be packed with the right alignment restrictions. @@ -384,31 +384,31 @@ public: // This class is able to "read" an InputCDR from a socket. TAO_InputCDR (const char* buf, size_t bufsiz, - int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = - TAO_Marshal::DEFAULT_MARSHAL_FACTORY); + int byte_order = TAO_ENCAP_BYTE_ORDER, + TAO_Marshal_Factory *f = + TAO_Marshal::DEFAULT_MARSHAL_FACTORY); // Create an input stream from an arbitrary buffer, care must be // exercised wrt alignment, because this contructor will *not* work // if the buffer is unproperly aligned. TAO_InputCDR (size_t bufsiz, - int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = - TAO_Marshal::DEFAULT_MARSHAL_FACTORY); + int byte_order = TAO_ENCAP_BYTE_ORDER, + TAO_Marshal_Factory *f = + TAO_Marshal::DEFAULT_MARSHAL_FACTORY); // Create an empty input stream. The caller is responsible for // putting the right data and providing the right alignment. TAO_InputCDR (ACE_Message_Block *data, - int byte_order = + int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = + TAO_Marshal_Factory *f = TAO_Marshal::DEFAULT_MARSHAL_FACTORY); // Create an input stream from an ACE_Message_Block TAO_InputCDR (ACE_Data_Block *data, - int byte_order = + int byte_order = TAO_ENCAP_BYTE_ORDER, - TAO_Marshal_Factory *f = + TAO_Marshal_Factory *f = TAO_Marshal::DEFAULT_MARSHAL_FACTORY); // Create an input stream from an ACE_Data_Block @@ -419,8 +419,8 @@ public: // efficiently. TAO_InputCDR (const TAO_InputCDR& rhs, - size_t size, - CORBA::Long offset); + size_t size, + CORBA::Long offset); // When interpreting indirected TypeCodes it is useful to make a // "copy" of the stream starting in the new position. @@ -460,31 +460,31 @@ public: // elements. // They return 0 on failure and 1 on success. CORBA_Boolean read_boolean_array (CORBA::Boolean* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_char_array (CORBA::Char* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_wchar_array (CORBA::WChar* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_octet_array (CORBA::Octet* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_short_array (CORBA::Short* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_ushort_array (CORBA::UShort* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_long_array (CORBA::Long* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_ulong_array (CORBA::ULong* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_longlong_array (CORBA::LongLong* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_ulonglong_array (CORBA::ULongLong* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_float_array (CORBA::Float* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_double_array (CORBA::Double* x, - CORBA::ULong length); + CORBA::ULong length); CORBA_Boolean read_longdouble_array (CORBA::LongDouble* x, - CORBA::ULong length); + CORBA::ULong length); // = TAO specific methods. @@ -567,7 +567,7 @@ private: // operations using asignment. CORBA_Boolean read_array (void* x, size_t size, size_t align, - CORBA::ULong length); + CORBA::ULong length); // read an array of <length> elements, each of <size> bytes and // the start aligned at a multiple of <align>. The elements are // assumed to be packed with the right alignment restrictions. @@ -600,27 +600,27 @@ private: #else // CDR output operators for primitive types extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::Short x); + CORBA::Short x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::UShort x); + CORBA::UShort x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::Long x); + CORBA::Long x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::ULong x); + CORBA::ULong x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::LongLong x); + CORBA::LongLong x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::ULongLong x); + CORBA::ULongLong x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::Float x); + CORBA::Float x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - CORBA::Double x); + CORBA::Double x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - const CORBA::Any &x); + const CORBA::Any &x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - const CORBA::Object *x); + const CORBA::Object *x); extern TAO_Export CORBA_Boolean operator<< (TAO_OutputCDR& cdr, - const CORBA::TypeCode *x); + const CORBA::TypeCode *x); // CDR output operator from helper classes extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr, @@ -634,31 +634,31 @@ extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr, extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr, CORBA::Any::from_string x); extern TAO_Export CORBA_Boolean operator << (TAO_OutputCDR& cdr, - const char* x); + const char* x); // CDR input operators for primitive types extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Short &x); + CORBA::Short &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::UShort &x); + CORBA::UShort &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Long &x); + CORBA::Long &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::ULong &x); + CORBA::ULong &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::LongLong &x); + CORBA::LongLong &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::ULongLong &x); + CORBA::ULongLong &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Float &x); + CORBA::Float &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Double &x); + CORBA::Double &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Any &x); + CORBA::Any &x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::Object *&x); + CORBA::Object *&x); extern TAO_Export CORBA_Boolean operator>> (TAO_InputCDR& cdr, - CORBA::TypeCode *&x); + CORBA::TypeCode *&x); // CDR output operator from helper classes extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr, @@ -672,7 +672,7 @@ extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr, extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr, CORBA::Any::to_string x); extern TAO_Export CORBA_Boolean operator >> (TAO_InputCDR& cdr, - char*& x); + char*& x); #endif /* __ACE_INLINE */ diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index afa0e0f050b..78f8f734b58 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -5,7 +5,7 @@ // // = LIBRARY // TAO -// +// // = FILENAME // Client_Strategy_Factory.h // @@ -26,13 +26,13 @@ public: // = Intialization and termination methods. TAO_Client_Strategy_Factory (void); // Constructor. - + virtual ~TAO_Client_Strategy_Factory (void); // Destructor virtual ACE_Lock* create_iiop_profile_lock (void); - // create the lock for the forwarding IIOP Profile used by - // the TAO_GIOP_Invocation::location_forward and the + // create the lock for the forwarding IIOP Profile used by + // the TAO_GIOP_Invocation::location_forward and the // TAO_GIOP_Invocation::start virtual ACE_Creation_Strategy<TAO_Client_Connection_Handler> *create_client_creation_strategy (void); diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h index a13284ec412..666101b3192 100644 --- a/TAO/tao/Connect.h +++ b/TAO/tao/Connect.h @@ -18,6 +18,11 @@ // ============================================================================ # include "ace/Reactor.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + # include "ace/Acceptor.h" # include "ace/SOCK_Acceptor.h" # include "ace/Synch.h" @@ -68,7 +73,7 @@ public: // Object termination hook. protected: - + int check_unexpected_data (void); // This method checks for unexpected data @@ -76,7 +81,7 @@ protected: // State flag which, if non-zero, indicates that this handler is // looking to get input. Otherwise, any input received is // unexpected. - + int input_available_; // Flag indicating whether or not input is available. Only valid // when <expecting_response_> is non-zero. @@ -128,7 +133,7 @@ protected: ACE_thread_t calling_thread_; // the thread ID of the thread we were running in. - + ACE_SYNCH_CONDITION* cond_response_available_; // wait on reponse if the leader-follower model is active }; @@ -194,9 +199,9 @@ protected: virtual void send_response (TAO_OutputCDR &response); // Send <response> to the client on the other end. - + void send_error (CORBA::ULong request_id, - CORBA::Exception *ex); + CORBA::Exception *ex); // Send <error> to the client on the other end, which // means basically sending the exception. @@ -211,7 +216,7 @@ protected: // Perform appropriate closing. TAO_ORB_Core *orb_core_; - // Cache the ORB Core to minimize + // Cache the ORB Core to minimize }; #if defined (__ACE_INLINE__) diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index 6bcda5a3390..93d8ffde1d0 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -30,7 +30,7 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO +#define TAO_EXPORT_MACRO #if defined(_MSC_VER) #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -55,21 +55,21 @@ public: CORBA_DynAny_var (CORBA_DynAny_ptr); CORBA_DynAny_var (const CORBA_DynAny_var &); // copy constructor ~CORBA_DynAny_var (void); // destructor - + CORBA_DynAny_var &operator= (CORBA_DynAny_ptr); CORBA_DynAny_var &operator= (const CORBA_DynAny_var &); CORBA_DynAny_ptr operator-> (void) const; - + operator const CORBA_DynAny_ptr &() const; operator CORBA_DynAny_ptr &(); - + // These are here to satisfy g++'s way of dealing with templates. // These operators are not called in any TAO code but are // given a semi-reasonable definition anyway. CORBA::Boolean operator == (const CORBA_DynAny_var &); CORBA::Boolean operator != (const CORBA_DynAny_var &); - - // in, inout, out, _retn + + // in, inout, out, _retn CORBA_DynAny_ptr in (void) const; CORBA_DynAny_ptr &inout (void); CORBA_DynAny_ptr &out (void); @@ -99,7 +99,7 @@ public: operator CORBA_DynAny_ptr &(); CORBA_DynAny_ptr &ptr (void); CORBA_DynAny_ptr operator-> (void); - + private: CORBA_DynAny_ptr &ptr_; }; @@ -118,7 +118,7 @@ public: static CORBA_DynAny_ptr _duplicate (CORBA_DynAny_ptr obj); static CORBA_DynAny_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = CORBA::Environment::default_environment () ); static CORBA_DynAny_ptr _nil (void); @@ -166,7 +166,7 @@ public: class InvalidValue; typedef InvalidValue *InvalidValue_ptr; - + #endif /* end #if !defined */ @@ -203,7 +203,7 @@ public: class TypeMismatch; typedef TypeMismatch *TypeMismatch_ptr; - + #endif /* end #if !defined */ @@ -240,7 +240,7 @@ public: class InvalidSeq; typedef InvalidSeq *InvalidSeq_ptr; - + #endif /* end #if !defined */ @@ -272,202 +272,202 @@ public: #endif /* end #if !defined */ virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void assign ( CORBA_DynAny_ptr dyn_any, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void from_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Any * to_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr copy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_boolean ( CORBA::Boolean value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_octet ( CORBA::Octet value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_char ( CORBA::Char value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_short ( CORBA::Short value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_ushort ( CORBA::UShort value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_long ( CORBA::Long value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_ulong ( CORBA::ULong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_float ( CORBA::Float value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_double ( CORBA::Double value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_string ( const char * value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_reference ( CORBA::Object_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_typecode ( CORBA::TypeCode_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_longlong ( CORBA::LongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_ulonglong ( CORBA::ULongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_wchar ( CORBA::WChar value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean get_boolean ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Octet get_octet ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Char get_char ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Short get_short ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::UShort get_ushort ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Long get_long ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULong get_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Float get_float ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Double get_double ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual char * get_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Object_ptr get_reference ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TypeCode_ptr get_typecode ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::LongLong get_longlong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULongLong get_ulonglong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::WChar get_wchar ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Any * get_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr current_component ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean next ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean seek ( CORBA::Long index, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void rewind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DynAny (void); // default constructor - CORBA_DynAny (STUB_Object *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DynAny (STUB_Object *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DynAny (void); @@ -501,14 +501,14 @@ public: CORBA_DynEnum_var (CORBA_DynEnum_ptr); CORBA_DynEnum_var (const CORBA_DynEnum_var &); // copy constructor ~CORBA_DynEnum_var (void); // destructor - + CORBA_DynEnum_var &operator= (CORBA_DynEnum_ptr); CORBA_DynEnum_var &operator= (const CORBA_DynEnum_var &); CORBA_DynEnum_ptr operator-> (void) const; - + operator const CORBA_DynEnum_ptr &() const; operator CORBA_DynEnum_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_DynEnum_ptr in (void) const; CORBA_DynEnum_ptr &inout (void); CORBA_DynEnum_ptr &out (void); @@ -538,7 +538,7 @@ public: operator CORBA_DynEnum_ptr &(); CORBA_DynEnum_ptr &ptr (void); CORBA_DynEnum_ptr operator-> (void); - + private: CORBA_DynEnum_ptr &ptr_; }; @@ -557,39 +557,39 @@ public: static CORBA_DynEnum_ptr _duplicate (CORBA_DynEnum_ptr obj); static CORBA_DynEnum_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = CORBA::Environment::default_environment () ); static CORBA_DynEnum_ptr _nil (void); virtual char * value_as_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void value_as_string ( const char * value_as_string, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULong value_as_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void value_as_ulong ( CORBA::ULong value_as_ulong, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DynEnum (void); // default constructor - CORBA_DynEnum (STUB_Object *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DynEnum (STUB_Object *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DynEnum (void); @@ -621,16 +621,16 @@ public: NameValuePair_var (NameValuePair *); NameValuePair_var (const NameValuePair_var &); // copy constructor ~NameValuePair_var (void); // destructor - + NameValuePair_var &operator= (NameValuePair *); NameValuePair_var &operator= (const NameValuePair_var &); NameValuePair *operator-> (void); const NameValuePair *operator-> (void) const; - + operator const NameValuePair &() const; operator NameValuePair &(); operator NameValuePair &() const; - // in, inout, out, _retn + // in, inout, out, _retn const NameValuePair &in (void) const; NameValuePair &inout (void); NameValuePair *&out (void); @@ -652,7 +652,7 @@ public: operator NameValuePair *&(); NameValuePair *&ptr (void); NameValuePair *operator-> (void); - + private: NameValuePair *&ptr_; // assignment from T_var not allowed @@ -669,16 +669,16 @@ class _TAO_Unbounded_Sequence_NameValuePairSeq : public TAO_Unbounded_Base_Seque { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_NameValuePairSeq (void) // Default constructor. { } - + _TAO_Unbounded_Sequence_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum)) { } - + _TAO_Unbounded_Sequence_NameValuePairSeq (CORBA::ULong maximum, CORBA::ULong length, NameValuePair *data, @@ -686,26 +686,26 @@ public: : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + _TAO_Unbounded_Sequence_NameValuePairSeq (const _TAO_Unbounded_Sequence_NameValuePairSeq &rhs) // Copy constructor. : TAO_Unbounded_Base_Sequence (rhs) { NameValuePair *tmp1 = allocbuf (this->maximum_); NameValuePair * const tmp2 = ACE_reinterpret_cast (NameValuePair * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } - + _TAO_Unbounded_Sequence_NameValuePairSeq &operator= (const _TAO_Unbounded_Sequence_NameValuePairSeq &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -718,23 +718,23 @@ public: } else this->buffer_ = allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + NameValuePair *tmp1 = ACE_reinterpret_cast (NameValuePair *, this->buffer_); NameValuePair * const tmp2 = ACE_reinterpret_cast (NameValuePair * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + ~_TAO_Unbounded_Sequence_NameValuePairSeq (void) // Dtor. { this->_deallocate_buffer (); } - + // = Accessors. NameValuePair &operator[] (CORBA::ULong i) // operator [] @@ -743,7 +743,7 @@ public: NameValuePair* tmp = ACE_reinterpret_cast(NameValuePair*,this->buffer_); return tmp[i]; } - + const NameValuePair &operator[] (CORBA::ULong i) const // operator [] { @@ -751,51 +751,51 @@ public: NameValuePair * const tmp = ACE_reinterpret_cast (NameValuePair* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // = Static operations. static NameValuePair *allocbuf (CORBA::ULong size) // Allocate storage for the sequence. { return new NameValuePair[size]; } - + static void freebuf (NameValuePair *buffer) // Free the sequence. { delete [] buffer; } - + virtual void _allocate_buffer (CORBA::ULong length) { NameValuePair* tmp = allocbuf (length); - + if (this->buffer_ != 0) { NameValuePair *old = ACE_reinterpret_cast (NameValuePair *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) freebuf (old); - + } this->buffer_ = tmp; } - + virtual void _deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + NameValuePair *tmp = ACE_reinterpret_cast (NameValuePair *,this->buffer_); - + freebuf (tmp); this->buffer_ = 0; - } - + } + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + NameValuePair *get_buffer (CORBA::Boolean orphan = 0) { NameValuePair *result = 0; @@ -827,12 +827,12 @@ public: } return result; } - + const NameValuePair *get_buffer (void) const { return ACE_reinterpret_cast(const NameValuePair * ACE_CAST_CONST, this->buffer_); } - + void replace (CORBA::ULong max, CORBA::ULong length, NameValuePair *data, @@ -848,7 +848,7 @@ public: this->buffer_ = data; this->release_ = release; } - + }; #endif /* end #if !defined */ @@ -861,21 +861,21 @@ public: // NameValuePairSeq // ************************************************************* -class NameValuePairSeq : public +class NameValuePairSeq : public #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_NameValuePairSeq #else /* AHETI */ TAO_Unbounded_Sequence<NameValuePair> -#endif /* AHETI */ +#endif /* AHETI */ { public: NameValuePairSeq (void); // default ctor NameValuePairSeq (CORBA::ULong max); // uses max size NameValuePairSeq ( - CORBA::ULong max, - CORBA::ULong length, - NameValuePair *buffer, + CORBA::ULong max, + CORBA::ULong length, + NameValuePair *buffer, CORBA::Boolean release=0 ); NameValuePairSeq (const NameValuePairSeq &); // copy ctor @@ -900,17 +900,17 @@ public: NameValuePairSeq_var (NameValuePairSeq *); NameValuePairSeq_var (const NameValuePairSeq_var &); // copy constructor ~NameValuePairSeq_var (void); // destructor - + NameValuePairSeq_var &operator= (NameValuePairSeq *); NameValuePairSeq_var &operator= (const NameValuePairSeq_var &); NameValuePairSeq *operator-> (void); const NameValuePairSeq *operator-> (void) const; - + operator const NameValuePairSeq &() const; operator NameValuePairSeq &(); operator NameValuePairSeq &() const; NameValuePair &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const NameValuePairSeq &in (void) const; NameValuePairSeq &inout (void); NameValuePairSeq *&out (void); @@ -940,7 +940,7 @@ public: NameValuePairSeq *&ptr (void); NameValuePairSeq *operator-> (void); NameValuePair &operator[] (CORBA::ULong index); - + private: NameValuePairSeq *&ptr_; // assignment from T_var not allowed @@ -972,14 +972,14 @@ public: CORBA_DynStruct_var (CORBA_DynStruct_ptr); CORBA_DynStruct_var (const CORBA_DynStruct_var &); // copy constructor ~CORBA_DynStruct_var (void); // destructor - + CORBA_DynStruct_var &operator= (CORBA_DynStruct_ptr); CORBA_DynStruct_var &operator= (const CORBA_DynStruct_var &); CORBA_DynStruct_ptr operator-> (void) const; - + operator const CORBA_DynStruct_ptr &() const; operator CORBA_DynStruct_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_DynStruct_ptr in (void) const; CORBA_DynStruct_ptr &inout (void); CORBA_DynStruct_ptr &out (void); @@ -1009,7 +1009,7 @@ public: operator CORBA_DynStruct_ptr &(); CORBA_DynStruct_ptr &ptr (void); CORBA_DynStruct_ptr operator-> (void); - + private: CORBA_DynStruct_ptr &ptr_; }; @@ -1028,38 +1028,38 @@ public: static CORBA_DynStruct_ptr _duplicate (CORBA_DynStruct_ptr obj); static CORBA_DynStruct_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = CORBA::Environment::default_environment () ); static CORBA_DynStruct_ptr _nil (void); virtual char * current_member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind current_member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual NameValuePairSeq * get_members ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_members ( const NameValuePairSeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DynStruct (void); // default constructor - CORBA_DynStruct (STUB_Object *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DynStruct (STUB_Object *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DynStruct (void); @@ -1093,14 +1093,14 @@ public: CORBA_DynUnion_var (CORBA_DynUnion_ptr); CORBA_DynUnion_var (const CORBA_DynUnion_var &); // copy constructor ~CORBA_DynUnion_var (void); // destructor - + CORBA_DynUnion_var &operator= (CORBA_DynUnion_ptr); CORBA_DynUnion_var &operator= (const CORBA_DynUnion_var &); CORBA_DynUnion_ptr operator-> (void) const; - + operator const CORBA_DynUnion_ptr &() const; operator CORBA_DynUnion_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_DynUnion_ptr in (void) const; CORBA_DynUnion_ptr &inout (void); CORBA_DynUnion_ptr &out (void); @@ -1130,7 +1130,7 @@ public: operator CORBA_DynUnion_ptr &(); CORBA_DynUnion_ptr &ptr (void); CORBA_DynUnion_ptr operator-> (void); - + private: CORBA_DynUnion_ptr &ptr_; }; @@ -1149,55 +1149,55 @@ public: static CORBA_DynUnion_ptr _duplicate (CORBA_DynUnion_ptr obj); static CORBA_DynUnion_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = CORBA::Environment::default_environment () ); static CORBA_DynUnion_ptr _nil (void); virtual CORBA::Boolean set_as_default ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_as_default ( CORBA::Boolean set_as_default, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr discriminator ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind discriminator_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr member ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual char * member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void member_name ( const char * member_name, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DynUnion (void); // default constructor - CORBA_DynUnion (STUB_Object *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DynUnion (STUB_Object *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DynUnion (void); @@ -1219,16 +1219,16 @@ class _TAO_Unbounded_Sequence_AnySeq : public TAO_Unbounded_Base_Sequence { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_AnySeq (void) // Default constructor. { } - + _TAO_Unbounded_Sequence_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum)) { } - + _TAO_Unbounded_Sequence_AnySeq (CORBA::ULong maximum, CORBA::ULong length, CORBA::Any *data, @@ -1236,26 +1236,26 @@ public: : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + _TAO_Unbounded_Sequence_AnySeq (const _TAO_Unbounded_Sequence_AnySeq &rhs) // Copy constructor. : TAO_Unbounded_Base_Sequence (rhs) { CORBA::Any *tmp1 = allocbuf (this->maximum_); CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } - + _TAO_Unbounded_Sequence_AnySeq &operator= (const _TAO_Unbounded_Sequence_AnySeq &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -1268,23 +1268,23 @@ public: } else this->buffer_ = allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_); CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + ~_TAO_Unbounded_Sequence_AnySeq (void) // Dtor. { this->_deallocate_buffer (); } - + // = Accessors. CORBA::Any &operator[] (CORBA::ULong i) // operator [] @@ -1293,7 +1293,7 @@ public: CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_); return tmp[i]; } - + const CORBA::Any &operator[] (CORBA::ULong i) const // operator [] { @@ -1301,51 +1301,51 @@ public: CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // = Static operations. static CORBA::Any *allocbuf (CORBA::ULong size) // Allocate storage for the sequence. { return new CORBA::Any[size]; } - + static void freebuf (CORBA::Any *buffer) // Free the sequence. { delete [] buffer; } - + virtual void _allocate_buffer (CORBA::ULong length) { CORBA::Any* tmp = allocbuf (length); - + if (this->buffer_ != 0) { CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) freebuf (old); - + } this->buffer_ = tmp; } - + virtual void _deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_); - + freebuf (tmp); this->buffer_ = 0; - } - + } + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + CORBA::Any *get_buffer (CORBA::Boolean orphan = 0) { CORBA::Any *result = 0; @@ -1377,12 +1377,12 @@ public: } return result; } - + const CORBA::Any *get_buffer (void) const { return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_); } - + void replace (CORBA::ULong max, CORBA::ULong length, CORBA::Any *data, @@ -1398,7 +1398,7 @@ public: this->buffer_ = data; this->release_ = release; } - + }; #endif /* end #if !defined */ @@ -1411,21 +1411,21 @@ public: // AnySeq // ************************************************************* -class AnySeq : public +class AnySeq : public #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_AnySeq #else /* AHETI */ TAO_Unbounded_Sequence<CORBA::Any> -#endif /* AHETI */ +#endif /* AHETI */ { public: AnySeq (void); // default ctor AnySeq (CORBA::ULong max); // uses max size AnySeq ( - CORBA::ULong max, - CORBA::ULong length, - CORBA::Any *buffer, + CORBA::ULong max, + CORBA::ULong length, + CORBA::Any *buffer, CORBA::Boolean release=0 ); AnySeq (const AnySeq &); // copy ctor @@ -1450,17 +1450,17 @@ public: AnySeq_var (AnySeq *); AnySeq_var (const AnySeq_var &); // copy constructor ~AnySeq_var (void); // destructor - + AnySeq_var &operator= (AnySeq *); AnySeq_var &operator= (const AnySeq_var &); AnySeq *operator-> (void); const AnySeq *operator-> (void) const; - + operator const AnySeq &() const; operator AnySeq &(); operator AnySeq &() const; CORBA::Any &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const AnySeq &in (void) const; AnySeq &inout (void); AnySeq *&out (void); @@ -1490,7 +1490,7 @@ public: AnySeq *&ptr (void); AnySeq *operator-> (void); CORBA::Any &operator[] (CORBA::ULong index); - + private: AnySeq *&ptr_; // assignment from T_var not allowed @@ -1522,14 +1522,14 @@ public: CORBA_DynSequence_var (CORBA_DynSequence_ptr); CORBA_DynSequence_var (const CORBA_DynSequence_var &); // copy constructor ~CORBA_DynSequence_var (void); // destructor - + CORBA_DynSequence_var &operator= (CORBA_DynSequence_ptr); CORBA_DynSequence_var &operator= (const CORBA_DynSequence_var &); CORBA_DynSequence_ptr operator-> (void) const; - + operator const CORBA_DynSequence_ptr &() const; operator CORBA_DynSequence_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_DynSequence_ptr in (void) const; CORBA_DynSequence_ptr &inout (void); CORBA_DynSequence_ptr &out (void); @@ -1559,7 +1559,7 @@ public: operator CORBA_DynSequence_ptr &(); CORBA_DynSequence_ptr &ptr (void); CORBA_DynSequence_ptr operator-> (void); - + private: CORBA_DynSequence_ptr &ptr_; }; @@ -1578,39 +1578,39 @@ public: static CORBA_DynSequence_ptr _duplicate (CORBA_DynSequence_ptr obj); static CORBA_DynSequence_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = CORBA::Environment::default_environment () ); static CORBA_DynSequence_ptr _nil (void); virtual CORBA::ULong length ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void length ( CORBA::ULong length, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_elements ( const AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DynSequence (void); // default constructor - CORBA_DynSequence (STUB_Object *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DynSequence (STUB_Object *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DynSequence (void); @@ -1644,14 +1644,14 @@ public: CORBA_DynArray_var (CORBA_DynArray_ptr); CORBA_DynArray_var (const CORBA_DynArray_var &); // copy constructor ~CORBA_DynArray_var (void); // destructor - + CORBA_DynArray_var &operator= (CORBA_DynArray_ptr); CORBA_DynArray_var &operator= (const CORBA_DynArray_var &); CORBA_DynArray_ptr operator-> (void) const; - + operator const CORBA_DynArray_ptr &() const; operator CORBA_DynArray_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn CORBA_DynArray_ptr in (void) const; CORBA_DynArray_ptr &inout (void); CORBA_DynArray_ptr &out (void); @@ -1681,7 +1681,7 @@ public: operator CORBA_DynArray_ptr &(); CORBA_DynArray_ptr &ptr (void); CORBA_DynArray_ptr operator-> (void); - + private: CORBA_DynArray_ptr &ptr_; }; @@ -1700,30 +1700,30 @@ public: static CORBA_DynArray_ptr _duplicate (CORBA_DynArray_ptr obj); static CORBA_DynArray_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env = + CORBA::Environment &env = CORBA::Environment::default_environment () ); static CORBA_DynArray_ptr _nil (void); virtual AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_elements ( const AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &env = + const CORBA::Char *type_id, + CORBA::Environment &env = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: CORBA_DynArray (void); // default constructor - CORBA_DynArray (STUB_Object *objref, - TAO_ServantBase *_tao_servant = 0, + CORBA_DynArray (STUB_Object *objref, + TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); virtual ~CORBA_DynArray (void); diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h index 25929e6e430..71ec439914d 100644 --- a/TAO/tao/DynAny_i.h +++ b/TAO/tao/DynAny_i.h @@ -14,13 +14,13 @@ // ========================================================================= #ifndef TAO_DYNANY_I_H -#define TAO_DYNANY_I_H +#define TAO_DYNANY_I_H #include "tao/corba.h" class TAO_Export TAO_DynAny_i : public POA_CORBA::DynAny { - // = TITLE + // = TITLE // TAO_DynAny_i // // = DESCRIPTION @@ -29,7 +29,7 @@ class TAO_Export TAO_DynAny_i : public POA_CORBA::DynAny public: TAO_DynAny_i (CORBA_TypeCode_ptr tc); // constructor with TypeCode argument - + TAO_DynAny_i (const CORBA_Any& any); // constructor with Any argument @@ -64,7 +64,7 @@ public: CORBA::Boolean next (CORBA::Environment &); // Returns next component, again here there is only one - CORBA::Boolean seek (CORBA::Long index, + CORBA::Boolean seek (CORBA::Long index, CORBA::Environment &); // In this class, returns true only for index of 0 diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h index 7b0e124e7e0..73d8d330551 100644 --- a/TAO/tao/DynArray_i.h +++ b/TAO/tao/DynArray_i.h @@ -19,6 +19,10 @@ #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class TAO_Export TAO_DynArray_i : public POA_CORBA::DynArray { // = TITLE @@ -74,7 +78,7 @@ public: CORBA::Boolean next (CORBA::Environment &); // Returns next component - CORBA::Boolean seek (CORBA::Long index, + CORBA::Boolean seek (CORBA::Long index, CORBA::Environment &); // Jump to component at <index> diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h index 8f65b184d15..104e82474e3 100644 --- a/TAO/tao/DynEnum_i.h +++ b/TAO/tao/DynEnum_i.h @@ -19,6 +19,10 @@ #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class TAO_Export TAO_DynEnum_i : public POA_CORBA::DynEnum { // = TITLE @@ -78,7 +82,7 @@ public: CORBA::Boolean next (CORBA::Environment &); // Returns next component - CORBA::Boolean seek (CORBA::Long index, + CORBA::Boolean seek (CORBA::Long index, CORBA::Environment &); // Jump to component at <index> diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h index a65bd5c240b..3b178c6cf62 100644 --- a/TAO/tao/DynSequence_i.h +++ b/TAO/tao/DynSequence_i.h @@ -19,6 +19,10 @@ #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class TAO_Export TAO_DynSequence_i : public POA_CORBA::DynSequence { // = TITLE @@ -81,7 +85,7 @@ public: CORBA::Boolean next (CORBA::Environment &); // Returns next component - CORBA::Boolean seek (CORBA::Long index, + CORBA::Boolean seek (CORBA::Long index, CORBA::Environment &); // Jump to component at <index> diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h index 7764e8c36bb..472adbfe23c 100644 --- a/TAO/tao/DynStruct_i.h +++ b/TAO/tao/DynStruct_i.h @@ -15,10 +15,14 @@ // ======================================================================== #ifndef TAO_DYNSTRUCT_I_H -#define TAO_DYNSTRUCT_I_H +#define TAO_DYNSTRUCT_I_H #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class TAO_Export TAO_DynStruct_i : public POA_CORBA::DynStruct { // = TITLE @@ -79,7 +83,7 @@ public: CORBA::Boolean next (CORBA::Environment &); // Returns next component - CORBA::Boolean seek (CORBA::Long index, + CORBA::Boolean seek (CORBA::Long index, CORBA::Environment &); // Jump to component at <index> diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h index 98a8d559799..fa2789f2fdc 100644 --- a/TAO/tao/DynUnion_i.h +++ b/TAO/tao/DynUnion_i.h @@ -93,7 +93,7 @@ public: CORBA::Boolean next (CORBA::Environment &); // Returns next component - CORBA::Boolean seek (CORBA::Long index, + CORBA::Boolean seek (CORBA::Long index, CORBA::Environment &); // Jump to component at <index> @@ -184,7 +184,7 @@ private: TAO_DynUnion_i (const TAO_DynUnion_i &src); TAO_DynUnion_i &operator= (const TAO_DynUnion_i &src); - // Some specialized instantiations of template class (defined in + // Some specialized instantiations of template class (defined in // DynUnion_i_T.h) class WChar_extractor : public DU_Extractor_base @@ -193,7 +193,7 @@ private: CORBA::Boolean check_match (const CORBA_Any& inside_any, const CORBA_Any& outside_any); private: - CORBA::WChar arg_index_; + CORBA::WChar arg_index_; CORBA::WChar member_index_; }; @@ -203,7 +203,7 @@ private: CORBA::Boolean check_match (const CORBA_Any& inside_any, const CORBA_Any& outside_any); private: - CORBA::ULong arg_index_; + CORBA::ULong arg_index_; CORBA::ULong member_index_; }; diff --git a/TAO/tao/DynUnion_i_T.h b/TAO/tao/DynUnion_i_T.h index 421da84d973..5d6cc452e52 100644 --- a/TAO/tao/DynUnion_i_T.h +++ b/TAO/tao/DynUnion_i_T.h @@ -27,7 +27,7 @@ class DU_Extractor_base // Base class of template class below // public: - virtual + virtual CORBA::Boolean check_match (const CORBA_Any& inside_any, const CORBA_Any& outside_any) = 0; }; @@ -39,19 +39,19 @@ class DU_Extractor : public DU_Extractor_base // DU_Extractor // // = DESCRIPTION - // Template class functor to compare Anys in TAO_DynUnion_i + // Template class functor to compare Anys in TAO_DynUnion_i // constructor with an Any arg and member function from_any(). - // Some compilers won't accept these eclarations inside + // Some compilers won't accept these eclarations inside // TAO_DynUnion_i or even at global scope in the same file. // public: CORBA::Boolean check_match (const CORBA_Any& inside_any, const CORBA_Any& outside_any); private: - Type arg_index_; + Type arg_index_; Type member_index_; }; - + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/DynUnion_i_T.cpp" // On Win32 platforms, this code will be included as template source diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index afb0f487b2d..0a5e4e94047 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -33,13 +33,13 @@ class TAO_Export CORBA_Environment // = TITLE // CORBA_Environment // - // = DESCRIPTION + // = DESCRIPTION // // A CORBA_Environment is a way to automagically ensure that // exception data is freed -- the "var" class for Exceptions. It // adds just a bit of convenience function support, helping // classify exceptions as well as reducing memory leakage. - // + // // The thread has a default environment to simplify porting // between platforms that support native C++ exceptions and those // that don't. This is a TSS resource (always), but with a twist: diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 06dfcc9f13d..f99d600ac33 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -268,7 +268,7 @@ public: // in CPU time; it allocates no new memory. static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Make the TypeCode for the CORBA::UnknownUserException standard // exception. @@ -280,7 +280,7 @@ public: // Runtime finalization of all standard exception typecodes. static CORBA_Exception *create_system_exception (const char* id, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Create a CORBA::SystemException given the interface repository // ID. diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h index e4094d9e765..f82b14491fb 100644 --- a/TAO/tao/GIOP.h +++ b/TAO/tao/GIOP.h @@ -307,17 +307,17 @@ public: static CORBA::Boolean start_message (TAO_GIOP::Message_Type t, TAO_OutputCDR &msg, - TAO_ORB_Core* orb_core); + TAO_ORB_Core* orb_core); // Build the header for a message of type <t> into stream <msg>. static CORBA::Boolean send_request (TAO_SVC_HANDLER *handler, TAO_OutputCDR &stream, - TAO_ORB_Core* orb_core); + TAO_ORB_Core* orb_core); // Send message, returns TRUE if success, else FALSE. static TAO_GIOP::Message_Type recv_request (TAO_SVC_HANDLER *&handler, - TAO_InputCDR &msg, - TAO_ORB_Core *orb_core); + TAO_InputCDR &msg, + TAO_ORB_Core *orb_core); // Reads message, returns message type from header. static void make_error (TAO_OutputCDR &msg, ...); @@ -342,33 +342,33 @@ public: // Returns the stringified <MsgType>. static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::ExceptionType corba_type); - // Convert the exception type from CORBA to GIOP + // Convert the exception type from CORBA to GIOP private: static CORBA::Boolean start_message_lite (TAO_GIOP::Message_Type t, - TAO_OutputCDR &msg); + TAO_OutputCDR &msg); // Build the lightweight header for a message of type <t> into // stream <msg>. static CORBA::Boolean start_message_std (TAO_GIOP::Message_Type t, - TAO_OutputCDR &msg); + TAO_OutputCDR &msg); // Build the standard header for a message of type <t> into // stream <msg>. static int parse_header_std (TAO_InputCDR &cdr, - int& do_byte_swap, - TAO_GIOP::Message_Type& message_type, - CORBA::ULong& message_size); + int& do_byte_swap, + TAO_GIOP::Message_Type& message_type, + CORBA::ULong& message_size); static int parse_header_lite (TAO_InputCDR &cdr, - int& do_byte_swap, - TAO_GIOP::Message_Type& message_type, - CORBA::ULong& message_size); + int& do_byte_swap, + TAO_GIOP::Message_Type& message_type, + CORBA::ULong& message_size); static int parse_header (TAO_InputCDR &cdr, - int& do_byte_swap, - TAO_GIOP::Message_Type& message_type, - CORBA::ULong& message_size, - TAO_ORB_Core *orb_core); + int& do_byte_swap, + TAO_GIOP::Message_Type& message_type, + CORBA::ULong& message_size, + TAO_ORB_Core *orb_core); // Parse the header, extracting all the relevant info. }; diff --git a/TAO/tao/IIOP_Interpreter.h b/TAO/tao/IIOP_Interpreter.h index adafb4710ca..dfefb3bf4ca 100644 --- a/TAO/tao/IIOP_Interpreter.h +++ b/TAO/tao/IIOP_Interpreter.h @@ -106,10 +106,10 @@ public: size_t &alignment, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static size_t calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, - TAO_InputCDR *stream, - CORBA::TCKind kind, - size_t &alignment, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + TAO_InputCDR *stream, + CORBA::TCKind kind, + size_t &alignment, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // For a given typecode, figure out its size and alignment needs. // This version is used mostly when traversing other typecodes, and // follows these rules: @@ -166,8 +166,8 @@ public: #if defined (TAO_NO_COPY_OCTET_SEQUENCES) static size_t calc_seq_attributes (TAO_InputCDR *stream, - size_t &alignment, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + size_t &alignment, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculate size and alignment for a sequence, most of them have // the same requirements, but for the sequences of Octets that are // optimized to minimize copying. diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h index 0234d6fbd11..0250ab8c331 100644 --- a/TAO/tao/IIOP_Object.h +++ b/TAO/tao/IIOP_Object.h @@ -149,19 +149,19 @@ class TAO_Export IIOP_Object : public STUB_Object // specific to objrefs with IIOP::Profile. public: virtual void do_static_call (CORBA_Environment &env, - const TAO_Call_Data *info, - void** args); + const TAO_Call_Data *info, + void** args); // SII-based "Stub interpreter" for static stubs. IDL compiler just // dumps a read-only description of the call into "calldata" and do // varargs calls to this routine, which does all the work. virtual void do_dynamic_call (const char *opname, - CORBA::Boolean is_roundtrip, - CORBA::NVList_ptr args, - CORBA::NamedValue_ptr result, - CORBA::Flags flags, - CORBA::ExceptionList &exceptions, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA::Boolean is_roundtrip, + CORBA::NVList_ptr args, + CORBA::NamedValue_ptr result, + CORBA::Flags flags, + CORBA::ExceptionList &exceptions, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // DII-based invocation analogue of the <do_static_call> above. // Differs in how the vararg calling convention is implemented -- // DII doesn't use the normal call stack with its implicit typing, @@ -185,7 +185,7 @@ public: // IIOP engine does not need to worry about such issues since it // only supports one protocol -- the problem won't show up. // "Multiprotocol ORBs" will need to solve that problem though. ] - + // = Construction IIOP_Object (char *repository_id); // Construct from a repository (type) ID. @@ -243,15 +243,15 @@ public: protected: void put_params (CORBA_Environment &env, - const TAO_Call_Data *info, - TAO_GIOP_Invocation &call, - void** args); + const TAO_Call_Data *info, + TAO_GIOP_Invocation &call, + void** args); // Helper method to factor out common code in static oneway // vs. twoway invocations. void put_params (TAO_GIOP_Invocation &call, - CORBA::NVList_ptr args, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA::NVList_ptr args, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Helper method to factor out common code in dynamic oneway // vs. twoway invocations. @@ -261,7 +261,7 @@ protected: ACE_Lock* fwd_profile_lock_ptr_; // Mutex to protect access to the forwarding profile - + size_t fwd_profile_success_; // Have we successfully talked to the forward profile yet? diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h index 9a3b273abdb..86907bbd215 100644 --- a/TAO/tao/InconsistentTypeCodeC.h +++ b/TAO/tao/InconsistentTypeCodeC.h @@ -30,7 +30,7 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO +#define TAO_EXPORT_MACRO #if defined(_MSC_VER) #pragma warning(disable:4250) #endif /* _MSC_VER */ diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index 60e1e79965a..423bae09e10 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -80,21 +80,21 @@ protected: private: - CORBA::Boolean + CORBA::Boolean write_request_header (const TAO_GIOP_ServiceContextList& svc_ctx, CORBA::ULong request_id, CORBA::Boolean is_roundtrip, const TAO_opaque* key, const char* opname, CORBA::Principal_ptr principal); - CORBA::Boolean + CORBA::Boolean write_request_header_std (const TAO_GIOP_ServiceContextList& svc_ctx, CORBA::ULong request_id, CORBA::Boolean is_roundtrip, const TAO_opaque* key, const char* opname, CORBA::Principal_ptr principal); - CORBA::Boolean + CORBA::Boolean write_request_header_lite (const TAO_GIOP_ServiceContextList& svc_ctx, CORBA::ULong request_id, CORBA::Boolean is_roundtrip, diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 4b39aeba081..2bbc58abcc0 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -195,13 +195,13 @@ typedef u_int CORBA_Flags; typedef struct TAO_Leader_Follower_Info_Struct { - ACE_SYNCH_MUTEX leader_follower_lock_; + ACE_SYNCH_MUTEX leader_follower_lock_; // do protect the access to the following three members - + ACE_Unbounded_Set<ACE_SYNCH_CONDITION *> follower_set_; // keep a set of followers around (protected) - int leaders_; + int leaders_; // 0 if no leader is around, 1 if there is a leader // > 1 if we do nested upcalls (protected) @@ -508,7 +508,7 @@ public: typedef CORBA_ORB_var ORB_var; typedef CORBA_ORB_out ORB_out; - typedef CORBA_Request Request; + typedef CORBA_Request Request; typedef Request *Request_ptr; typedef CORBA_Request_var Request_var; typedef CORBA_Request_out Request_out; @@ -794,10 +794,10 @@ class TAO_Export CORBA_ORB // as how to marshal and unmarshal them. // public: - + // ORB_Core has special privileges friend class TAO_ORB_Core; - + static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb); // Return a duplicate of <{orb}>. When work with this duplicate is // complete, it should be freed up using <CORBA::release()>. @@ -961,7 +961,7 @@ public: int should_shutdown (void); // Get the shutdown flag value - // Forward declaration and typedefs for the exception thrown by + // Forward declaration and typedefs for the exception thrown by // the ORB Dynamic Any factory functions. class CORBA_ORB_InconsistentTypeCode; typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode; diff --git a/TAO/tao/ORB_Strategies_T.h b/TAO/tao/ORB_Strategies_T.h index 2485fe7f2c5..ab1137cb540 100644 --- a/TAO/tao/ORB_Strategies_T.h +++ b/TAO/tao/ORB_Strategies_T.h @@ -19,6 +19,10 @@ #include "ace/Strategies_T.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + template <class SH> class TAO_Reactive_Strategy : public ACE_Reactive_Strategy<SH> { diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index d8d4aead193..92fcf2ba861 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -41,7 +41,7 @@ public: // return a NUL object static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // no-op it is just here to simplify some templates. // These calls correspond to over-the-wire operations, or at least @@ -132,7 +132,7 @@ public: // get the underlying stub object virtual void _use_locate_requests (CORBA::Boolean use_it); - // the the object to use a locate request for the first call to + // the the object to use a locate request for the first call to // the object protected: @@ -228,7 +228,7 @@ public: // destructor virtual void _downcast (CORBA_Object* base_ptr, - CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; virtual CORBA_Object* _upcast (void) = 0; virtual void _release (void) = 0; }; diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 03976bba051..df8e28a944a 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -4,7 +4,7 @@ // Hand-modified by Chris Cleeland. // // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO ORB and the TAO IDL Compiler have been developed by Washington +// TAO ORB and the TAO IDL Compiler have been developed by Washington // University Computer Science's Distributed Object Computing Group. // // Information on TAO is available at @@ -19,7 +19,7 @@ // ************************************************************* // TAO_tao_seq_Octet // ************************************************************* - + typedef TAO_Unbounded_Sequence<CORBA::Octet > TAO_tao_seq_Octet; typedef TAO_tao_seq_Octet* TAO_tao_seq_Octet_ptr; @@ -39,17 +39,17 @@ public: TAO_tao_seq_Octet_var (TAO_tao_seq_Octet *); TAO_tao_seq_Octet_var (const TAO_tao_seq_Octet_var &); // copy constructor ~TAO_tao_seq_Octet_var (void); // destructor - + TAO_tao_seq_Octet_var &operator= (TAO_tao_seq_Octet *); TAO_tao_seq_Octet_var &operator= (const TAO_tao_seq_Octet_var &); TAO_tao_seq_Octet *operator-> (void); const TAO_tao_seq_Octet *operator-> (void) const; - + operator const TAO_tao_seq_Octet &() const; operator TAO_tao_seq_Octet &(); operator TAO_tao_seq_Octet &() const; CORBA::Octet &operator[] (CORBA::ULong index); - // in, inout, out, _retn + // in, inout, out, _retn const TAO_tao_seq_Octet &in (void) const; TAO_tao_seq_Octet &inout (void); TAO_tao_seq_Octet *&out (void); @@ -77,7 +77,7 @@ public: TAO_tao_seq_Octet *&ptr (void); TAO_tao_seq_Octet *operator-> (void); CORBA::Octet &operator[] (CORBA::ULong index); - + private: TAO_tao_seq_Octet *&ptr_; // assignment from T_var not allowed diff --git a/TAO/tao/Object_Table.h b/TAO/tao/Object_Table.h index fbfabbb29a2..d9a565d0682 100644 --- a/TAO/tao/Object_Table.h +++ b/TAO/tao/Object_Table.h @@ -5,13 +5,13 @@ // // = LIBRARY // TAO -// +// // = FILENAME // objtable.h // // = AUTHOR // Aniruddha Gokhale -// +// // ============================================================================ #ifndef TAO_OBJTABLE_H @@ -69,12 +69,12 @@ class TAO_Export TAO_Object_Table_Impl // Servants. // // = DESCRIPTION - // + // // = NOTES // Iterators may return free entries, whose "int_id" (the servant) // is 0. public: - enum + enum { // Default table size DEFAULT_TABLE_SIZE = TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE @@ -83,14 +83,14 @@ public: virtual ~TAO_Object_Table_Impl (void); // Destructor. - virtual int bind (const PortableServer::ObjectId &id, - PortableServer::Servant servant) = 0; + virtual int bind (const PortableServer::ObjectId &id, + PortableServer::Servant servant) = 0; // Associate <{id}> with <{servant}>, returning 0 if object is // registered successfully, 1 if it's already registered, and -1 if // a failure occurs during registration. virtual int unbind (const PortableServer::ObjectId &id, - PortableServer::Servant &servant) = 0; + PortableServer::Servant &servant) = 0; // Remote any association among <id> and <servant>. // Returns 0 if the operation was succesful, <-1> otherwise. @@ -98,12 +98,12 @@ public: virtual TAO_Object_Table_Iterator_Impl *end () const = 0; // Iterator interface - virtual int find (const PortableServer::ObjectId &id, - PortableServer::Servant &servant) = 0; + virtual int find (const PortableServer::ObjectId &id, + PortableServer::Servant &servant) = 0; // Find object associated with <{id}>. // If the ObjectId is found it sets <{servant}> and returns a // non-negative integer. If not found, <{servant}> is unchanged and - // the value <-1> is returned. + // the value <-1> is returned. virtual int find (const PortableServer::Servant servant); // Returns 0 if <servant> is in the table, <-1> otherwise. @@ -117,12 +117,12 @@ public: // search on the iterator) makes sense, since the operation is not // time critical. virtual int find (const PortableServer::Servant servant, - PortableServer::ObjectId_out id); + PortableServer::ObjectId_out id); // Find the <id> for <servant>. // Returns <-1> if <servant> is not found or if more than one <id> // is associated with <servant>, returns <0> otherwise. - virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, + virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, CORBA::Environment &env) = 0; // Create an object id @@ -155,9 +155,9 @@ public: // Increase the current position. friend int operator==(const TAO_Object_Table_Iterator &l, - const TAO_Object_Table_Iterator &r); + const TAO_Object_Table_Iterator &r); friend int operator!=(const TAO_Object_Table_Iterator &l, - const TAO_Object_Table_Iterator &r); + const TAO_Object_Table_Iterator &r); // Compare two iterators. protected: @@ -170,33 +170,33 @@ class TAO_Export TAO_Object_Table // to pointers to CORBA objects. { public: - TAO_Object_Table (TAO_Object_Table_Impl *impl, + TAO_Object_Table (TAO_Object_Table_Impl *impl, int delete_impl = 0); // Constructor: Must pass valid <impl> TAO_Object_Table (int user_id_policy); // Constructor: System creates table based on <user_id_policy> - + virtual ~TAO_Object_Table (void); // Destructor. - int bind (const PortableServer::ObjectId &id, - PortableServer::Servant servant); + int bind (const PortableServer::ObjectId &id, + PortableServer::Servant servant); // Associate <{id}> with <{servant}>, returning 0 if object is // registered successfully, 1 if it's already registered, and -1 if // a failure occurs during registration. int unbind (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); + PortableServer::Servant &servant); // Remote any association among <id> and <servant>. // Returns 0 if the operation was succesful, <-1> otherwise. - int find (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); + int find (const PortableServer::ObjectId &id, + PortableServer::Servant &servant); // Find object associated with <{id}>. // If the ObjectId is found it sets <{servant}> and returns a // non-negative integer. If not found, <{servant}> is unchanged and - // the value <-1> is returned. + // the value <-1> is returned. int find (const PortableServer::Servant servant); // Returns 0 if <servant> is in the table, <-1> otherwise. @@ -210,12 +210,12 @@ public: // search on the iterator) makes sense, since the operation is not // time critical. int find (const PortableServer::Servant servant, - PortableServer::ObjectId_out id); + PortableServer::ObjectId_out id); // Find the <id> for <servant>. // Returns <-1> if <servant> is not found or if more than one <id> // is associated with <servant>, returns <0> otherwise. - PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, + PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, CORBA::Environment &env); // Create an object id @@ -266,21 +266,21 @@ class TAO_Export TAO_Dynamic_Hash_ObjTable : public TAO_Object_Table_Impl public: TAO_Dynamic_Hash_ObjTable (CORBA::ULong size); // constructor. If size is 0, some default is used. - + virtual ~TAO_Dynamic_Hash_ObjTable (void); // Implement TAO_Dynamic_Hash_ObjTable.... virtual int find (const PortableServer::Servant servant); virtual int find (const PortableServer::ObjectId &id); virtual int find (const PortableServer::Servant servant, - PortableServer::ObjectId_out id); - virtual int find (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); - virtual int bind (const PortableServer::ObjectId &id, - PortableServer::Servant servant); + PortableServer::ObjectId_out id); + virtual int find (const PortableServer::ObjectId &id, + PortableServer::Servant &servant); + virtual int bind (const PortableServer::ObjectId &id, + PortableServer::Servant servant); virtual int unbind (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); - virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, + PortableServer::Servant &servant); + virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, CORBA::Environment &env); virtual CORBA::ULong system_id_size (void) const; virtual TAO_Object_Table_Iterator_Impl *begin (void) const; @@ -289,11 +289,11 @@ public: // Dynamic Hashing scheme using template specialization for char* typedef ACE_Hash_Map_Manager<PortableServer::ObjectId, PortableServer::Servant, - ACE_SYNCH_NULL_MUTEX> + ACE_SYNCH_NULL_MUTEX> Hash_Map; typedef ACE_Hash_Map_Iterator<PortableServer::ObjectId, PortableServer::Servant, - ACE_SYNCH_NULL_MUTEX> + ACE_SYNCH_NULL_MUTEX> Iterator; protected: @@ -360,14 +360,14 @@ class TAO_Export TAO_Linear_ObjTable : public TAO_Object_Table_Impl // for the lookups. // public: - - enum + + enum { // Grow table exponentially up to 64K - MAX_EXPONENTIAL = 65536, + MAX_EXPONENTIAL = 65536, // Afterwards grow in chunks of 32K - LINEAR_INCREASE = 32768 + LINEAR_INCREASE = 32768 }; TAO_Linear_ObjTable (CORBA::ULong size); @@ -376,14 +376,14 @@ public: virtual int find (const PortableServer::Servant servant); virtual int find (const PortableServer::ObjectId &id); virtual int find (const PortableServer::Servant servant, - PortableServer::ObjectId_out id); - virtual int find (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); - virtual int bind (const PortableServer::ObjectId &id, - PortableServer::Servant servant); + PortableServer::ObjectId_out id); + virtual int find (const PortableServer::ObjectId &id, + PortableServer::Servant &servant); + virtual int bind (const PortableServer::ObjectId &id, + PortableServer::Servant servant); virtual int unbind (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); - virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, + PortableServer::Servant &servant); + virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, CORBA::Environment &env); virtual CORBA::ULong system_id_size (void) const; virtual TAO_Object_Table_Iterator_Impl *begin () const; @@ -426,15 +426,15 @@ public: virtual int find (const PortableServer::Servant servant); virtual int find (const PortableServer::ObjectId &id); virtual int find (const PortableServer::Servant servant, - PortableServer::ObjectId_out id); - virtual int find (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); - virtual int bind (const PortableServer::ObjectId &id, - PortableServer::Servant servant); + PortableServer::ObjectId_out id); + virtual int find (const PortableServer::ObjectId &id, + PortableServer::Servant &servant); + virtual int bind (const PortableServer::ObjectId &id, + PortableServer::Servant servant); virtual int unbind (const PortableServer::ObjectId &id, - PortableServer::Servant &servant); + PortableServer::Servant &servant); virtual CORBA::ULong system_id_size (void) const; - virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, + virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant, CORBA::Environment &env); protected: diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h index d612d88fd9b..e82cb6aaee4 100644 --- a/TAO/tao/Operation_Table.h +++ b/TAO/tao/Operation_Table.h @@ -38,13 +38,13 @@ class TAO_Export TAO_Operation_Table // operation names. public: virtual int find (const char *opname, - TAO_Skeleton &skelfunc) = 0; + TAO_Skeleton &skelfunc) = 0; // Uses <{opname}> to look up the skeleton function and pass it back // in <{skelfunc}>. Returns non-negative integer on success, or -1 // on failure. virtual int bind (const char *opname, - const TAO_Skeleton skel_ptr) = 0; + const TAO_Skeleton skel_ptr) = 0; // Associate the skeleton <{skel_ptr}> with an operation named // <{opname}>. Returns -1 on failure, 0 on success, 1 on duplicate. @@ -139,12 +139,12 @@ public: // destructor virtual int bind (const char *opname, - const TAO_Skeleton skel_ptr); + const TAO_Skeleton skel_ptr); // Associate the skeleton <{skel_ptr}> with an operation named // <{opname}>. Returns -1 on failure, 0 on success, 1 on duplicate. virtual int find (const char *opname, - TAO_Skeleton &skelfunc); + TAO_Skeleton &skelfunc); // Uses <{opname}> to look up the skeleton function and pass it back // in <{skelfunc}>. Returns non-negative integer on success, or -1 // on failure. @@ -168,13 +168,13 @@ public: // Destructor. virtual int find (const char *opname, - TAO_Skeleton &skel_ptr); + TAO_Skeleton &skel_ptr); // Uses <{opname}> to look up the skeleton function and pass it back // in <{skelfunc}>. Returns non-negative integer on success, or -1 // on failure. virtual int bind (const char *opname, - const TAO_Skeleton skelptr); + const TAO_Skeleton skelptr); // Associate the skeleton <{skel_ptr}> with an operation named // <{opname}>. Returns -1 on failure, 0 on success, 1 on duplicate. @@ -214,13 +214,13 @@ public: // destructor. virtual int find (const char *opname, - TAO_Skeleton &skel_ptr); + TAO_Skeleton &skel_ptr); // Uses <{opname}> to look up the skeleton function and pass it back // in <{skelfunc}>. Returns non-negative integer on success, or -1 // on failure. virtual int bind (const char *opname, - const TAO_Skeleton skelptr); + const TAO_Skeleton skelptr); // Associate the skeleton <{skel_ptr}> with an operation named // <{opname}>. Returns -1 on failure, 0 on success, 1 on duplicate. @@ -261,7 +261,7 @@ public: // on failure. virtual int bind (const char *opname, - const TAO_Skeleton skel_ptr); + const TAO_Skeleton skel_ptr); // Associate the skeleton <{skel_ptr}> with an operation named // <{opname}>. Returns -1 on failure, 0 on success, 1 on duplicate. @@ -278,13 +278,13 @@ class TAO_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table { // = TITLE // Helper class for using binary search operatin lookup strategy - // in the server skeletons. + // in the server skeletons. // // = DESCRIPTION // This class declares pure virtual method called 'lookup ()' // which will be generated by the GPERF program. This method is // used by 'bind ()' and 'find ()' methods. Subclasses will - // define the lookup method. + // define the lookup method. public: TAO_Binary_Search_OpTable (void); // Do nothing constructor. @@ -299,7 +299,7 @@ public: // on failure. virtual int bind (const char *opname, - const TAO_Skeleton skel_ptr); + const TAO_Skeleton skel_ptr); // Associate the skeleton <{skel_ptr}> with an operation named // <{opname}>. Returns -1 on failure, 0 on success, 1 on duplicate. diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h index 428dc784d6e..4a6ad5eb919 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -35,6 +35,10 @@ // String #include "ace/SString.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Map #include "ace/Hash_Map_Manager.h" @@ -66,7 +70,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::ThreadPolicyValue value_; @@ -90,7 +94,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::LifespanPolicyValue value_; @@ -114,7 +118,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::IdUniquenessPolicyValue value_; @@ -138,7 +142,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::IdAssignmentPolicyValue value_; @@ -162,7 +166,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::ImplicitActivationPolicyValue value_; @@ -186,7 +190,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::ServantRetentionPolicyValue value_; @@ -210,7 +214,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::RequestProcessingPolicyValue value_; @@ -240,7 +244,7 @@ public: virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::SynchronizationPolicyValue value_; @@ -328,11 +332,11 @@ public: TAO_Creation_Time (void); virtual void creation_time (const void *creation_time); - + virtual const void *creation_time (void) const; - + static int creation_time_length (void); - + int operator== (const TAO_Creation_Time &rhs) const; int operator!= (const TAO_Creation_Time &rhs) const; @@ -342,7 +346,7 @@ public: int operator!= (const TAO_Temporary_Creation_Time &rhs) const; protected: - + enum { SEC_FIELD = 0, @@ -362,13 +366,13 @@ public: TAO_Temporary_Creation_Time (void); virtual void creation_time (const void *creation_time); - + int operator== (const TAO_Creation_Time &rhs) const; int operator!= (const TAO_Creation_Time &rhs) const; protected: - + void *time_stamp_; }; @@ -482,7 +486,7 @@ public: CORBA::Object_ptr forward_to, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - // Utility functions for the other + // Utility functions for the other static void encode_sequence_to_string (CORBA::String &str, const TAO_Unbounded_Sequence<CORBA::Octet> &seq); static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq, @@ -494,7 +498,7 @@ public: static PortableServer::ObjectId *string_to_ObjectId (const char *id); - static PortableServer::ObjectId *string_to_ObjectId (const char *string, + static PortableServer::ObjectId *string_to_ObjectId (const char *string, int size); static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); @@ -654,12 +658,12 @@ protected: TAO_Temporary_Creation_Time &poa_creation_time); virtual int rfind (const TAO_ObjectKey &key, - char c, + char c, int pos = TAO_POA::String::npos) const; // Should really be protected, but some compilers complain public: - enum LOCATION_RESULT + enum LOCATION_RESULT { FOUND, DEFAULT_SERVANT, @@ -709,7 +713,7 @@ protected: static char persistent_key_char (void); static char transient_key_char (void); - + static CORBA::ULong persistent_key_type_length (void); virtual CORBA::Boolean system_id (void); @@ -719,7 +723,7 @@ protected: static char system_id_key_char (void); static char user_id_key_char (void); - + static CORBA::ULong system_id_key_type_length (void); virtual void create_internal_lock (void); @@ -748,7 +752,7 @@ protected: PortableServer::Servant default_servant_; - typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex> + typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex> CHILDREN; CHILDREN children_; diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index de0e67479b7..45e1a2806aa 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -915,7 +915,7 @@ public: // // ************************************************** - enum SynchronizationPolicyValue + enum SynchronizationPolicyValue { DEFAULT_LOCK, NULL_LOCK, diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index d9004eec426..394b4fb600d 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -185,250 +185,250 @@ public: virtual ~DynAny (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void assign ( CORBA_DynAny_ptr dyn_any, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void from_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Any * to_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void destroy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr copy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_boolean ( CORBA::Boolean value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_octet ( CORBA::Octet value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_char ( CORBA::Char value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_short ( CORBA::Short value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_ushort ( CORBA::UShort value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_long ( CORBA::Long value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_ulong ( CORBA::ULong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_float ( CORBA::Float value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_double ( CORBA::Double value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_string ( const char * value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_reference ( CORBA::Object_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_typecode ( CORBA::TypeCode_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_longlong ( CORBA::LongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_ulonglong ( CORBA::ULongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_wchar ( CORBA::WChar value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void insert_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Boolean get_boolean ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Octet get_octet ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Char get_char ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Short get_short ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::UShort get_ushort ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Long get_long ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::ULong get_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Float get_float ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Double get_double ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual char * get_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Object_ptr get_reference ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TypeCode_ptr get_typecode ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::LongLong get_longlong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::ULongLong get_ulonglong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::WChar get_wchar ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Any * get_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr current_component ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Boolean next ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::Boolean seek ( CORBA::Long index, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void rewind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &_tao_env = CORBA::Environment::default_environment () ); CORBA_DynAny *_this ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -448,194 +448,194 @@ public: DynAny_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TypeCode_ptr type ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void assign ( CORBA_DynAny_ptr CORBA_Dyn_any, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void from_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Any * to_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr copy ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_boolean ( CORBA::Boolean value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_octet ( CORBA::Octet value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_char ( CORBA::Char value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_short ( CORBA::Short value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_ushort ( CORBA::UShort value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_long ( CORBA::Long value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_ulong ( CORBA::ULong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_float ( CORBA::Float value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_double ( CORBA::Double value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_string ( const char * value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_reference ( CORBA::Object_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_typecode ( CORBA::TypeCode_ptr value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_longlong ( CORBA::LongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_ulonglong ( CORBA::ULongLong value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_wchar ( CORBA::WChar value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void insert_any ( const CORBA::Any & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean get_boolean ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Octet get_octet ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Char get_char ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Short get_short ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::UShort get_ushort ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Long get_long ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULong get_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Float get_float ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Double get_double ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual char * get_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Object_ptr get_reference ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TypeCode_ptr get_typecode ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::LongLong get_longlong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULongLong get_ulonglong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::WChar get_wchar ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Any * get_any ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr current_component ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean next ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean seek ( CORBA::Long index, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void rewind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); @@ -659,43 +659,43 @@ public: virtual ~DynEnum (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual char * value_as_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void value_as_string ( const char * value_as_string, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::ULong value_as_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void value_as_ulong ( CORBA::ULong value_as_ulong, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &_tao_env = CORBA::Environment::default_environment () ); CORBA_DynEnum *_this ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -716,25 +716,25 @@ public: DynEnum_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual char * value_as_string ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void value_as_string ( const char * value_as_string, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULong value_as_ulong ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void value_as_ulong ( CORBA::ULong value_as_ulong, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); @@ -757,42 +757,42 @@ public: virtual ~DynStruct (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual char * current_member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TCKind current_member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual NameValuePairSeq * get_members ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void set_members ( const NameValuePairSeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &_tao_env = CORBA::Environment::default_environment () ); CORBA_DynStruct *_this ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -813,24 +813,24 @@ public: DynStruct_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual char * current_member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind current_member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual NameValuePairSeq * get_members ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_members ( const NameValuePairSeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); @@ -853,63 +853,63 @@ public: virtual ~DynUnion (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::Boolean set_as_default ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void set_as_default ( CORBA::Boolean set_as_default, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr discriminator ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TCKind discriminator_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA_DynAny_ptr member ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual char * member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void member_name ( const char * member_name, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual CORBA::TCKind member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &_tao_env = CORBA::Environment::default_environment () ); CORBA_DynUnion *_this ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -930,41 +930,41 @@ public: DynUnion_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::Boolean set_as_default ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_as_default ( CORBA::Boolean set_as_default, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr discriminator ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind discriminator_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA_DynAny_ptr member ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual char * member_name ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void member_name ( const char * member_name, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::TCKind member_kind ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); @@ -987,36 +987,36 @@ public: virtual ~DynSequence (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::ULong length ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void length ( CORBA::ULong length, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void set_elements ( const AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; static void type_skel ( - CORBA::ServerRequest &req, + CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env = @@ -1026,12 +1026,12 @@ public: virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &_tao_env = CORBA::Environment::default_environment () ); CORBA_DynSequence *_this ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1052,25 +1052,25 @@ public: DynSequence_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual CORBA::ULong length ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void length ( CORBA::ULong length, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_elements ( const AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); @@ -1093,32 +1093,32 @@ public: virtual ~DynArray (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void* _downcast ( const char* logical_type_id ); virtual AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void set_elements ( const AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ) = 0; virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, - CORBA::Environment &_tao_env = + CORBA::Environment &_tao_env = CORBA::Environment::default_environment () ); CORBA_DynArray *_this ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; @@ -1139,16 +1139,16 @@ public: DynArray_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual AnySeq * get_elements ( - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); virtual void set_elements ( const AnySeq & value, - CORBA::Environment &_tao_environment = + CORBA::Environment &_tao_environment = CORBA::Environment::default_environment () ); diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 268af6b4881..bc9c7c59940 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -5,7 +5,7 @@ // // = LIBRARY // TAO -// +// // = FILENAME // principal.h // @@ -14,7 +14,7 @@ // // = AUTHOR // Copyright 1994-1995 by Sun Microsystems Inc. -// +// // ============================================================================ #ifndef TAO_PRINCIPAL_H diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index aadf9d151e0..652e3e983c2 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -59,8 +59,8 @@ public: // shrink and then delete could result in a memory leak. virtual void _downcast (void *target, - CORBA_Object *src, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Object *src, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Used for sequences of objects to downcast a recently demarshalled // object reference into the right type. @@ -249,13 +249,13 @@ public: const char *in (void) const; // for in parameter. - + char *&inout (void); // for inout parameter. - + char *&out (void); // for out parameter. - + char *_retn (void); // for string of return type. @@ -413,9 +413,9 @@ public: TAO_Unbounded_Sequence (void); TAO_Unbounded_Sequence (CORBA::ULong max); TAO_Unbounded_Sequence (CORBA::ULong max, - CORBA::ULong length, - CORBA::Octet *data, - CORBA::Boolean release = 0); + CORBA::ULong length, + CORBA::Octet *data, + CORBA::Boolean release = 0); ~TAO_Unbounded_Sequence (void); // see TAO_Unbounded_Sequence in "Sequence_T.h" @@ -464,7 +464,7 @@ public: // release the copy. TAO_Unbounded_Sequence (CORBA::ULong length, - const ACE_Message_Block* mb); + const ACE_Message_Block* mb); // Create a sequence of octets from a single message block (i.e. it // ignores any chaining in the meesage block). diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index 8218fe56995..e18a3dac000 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -36,9 +36,9 @@ public: // Constructor using a maximum length value. TAO_Unbounded_Sequence (CORBA::ULong max, - CORBA::ULong length, - T *data, - CORBA::Boolean release = 0); + CORBA::ULong length, + T *data, + CORBA::Boolean release = 0); // Constructor using the data and memory management flag. Memory // *must* be allocated using the ::allocbuf static method, since in // the future this classes may use a global ACE_Allocator. @@ -132,7 +132,7 @@ public: TAO_Bounded_Sequence (CORBA::ULong length, T *data, - CORBA::Boolean release=0); + CORBA::Boolean release=0); // Constructor using the data and memory management flag. TAO_Bounded_Sequence (const TAO_Bounded_Sequence<T,MAX> &); @@ -289,13 +289,13 @@ public: const T *in (void) const; // for in parameter. - + T *&inout (void); // for inout parameter. - + T *&out (void); // for out parameter. - + T *_retn (void); // for return type @@ -351,9 +351,9 @@ public: // to 0 and the release flag to TRUE. TAO_Unbounded_Object_Sequence (CORBA::ULong maximum, - CORBA::ULong length, - T* *data, - CORBA::Boolean release=0); + CORBA::ULong length, + T* *data, + CORBA::Boolean release=0); // The ``T *data'' constructor (as shown in the example above) // allows the length and contents of a bounded or unbounded sequence // to be set. For unbounded sequences, it also allows the initial @@ -423,10 +423,10 @@ public: virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); + CORBA::ULong old_length); virtual void _downcast (void* target, - CORBA_Object* src, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Object* src, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA_Object* _upcast (void* src) const; }; @@ -452,8 +452,8 @@ public: // contents vector, so it always sets the release flag to TRUE. TAO_Bounded_Object_Sequence (CORBA::ULong length, - T* *value, - CORBA::Boolean release=0); + T* *value, + CORBA::Boolean release=0); // Constructor from data. TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,MAX> &); @@ -479,10 +479,10 @@ public: virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); + CORBA::ULong old_length); virtual void _downcast (void* target, - CORBA_Object* src, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Object* src, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA_Object* _upcast (void* src) const; }; @@ -512,9 +512,9 @@ public: // Constructor with a "hint" for the maximum capacity. TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum, - CORBA::ULong length, - T* *data, - CORBA::Boolean release=0); + CORBA::ULong length, + T* *data, + CORBA::Boolean release=0); // Constructor with a given buffer. TAO_Unbounded_Pseudo_Sequence(const TAO_Unbounded_Pseudo_Sequence<T> &); @@ -542,7 +542,7 @@ public: virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); + CORBA::ULong old_length); }; // ************************************************************* @@ -563,8 +563,8 @@ public: // default ctor. TAO_Bounded_Pseudo_Sequence (CORBA::ULong length, - T* *value, - CORBA::Boolean release=0); + T* *value, + CORBA::Boolean release=0); // Constructor from data. TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T,MAX> &); @@ -590,7 +590,7 @@ public: virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); + CORBA::ULong old_length); }; // ************************************************************* @@ -616,8 +616,8 @@ public: // contents vector, so it always sets the release flag to TRUE. TAO_Bounded_String_Sequence (CORBA::ULong length, - char* *value, - CORBA::Boolean release = 0); + char* *value, + CORBA::Boolean release = 0); // {SPEC} // The ``T *data'' constructor (as shown in the example above) // allows the length and contents of a bounded or unbounded sequence @@ -677,7 +677,7 @@ public: virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); virtual void _shrink_buffer (CORBA::ULong new_length, - CORBA::ULong old_length); + CORBA::ULong old_length); }; // ************************************************************* diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h index 30e0dbc489e..ab4053aaad2 100644 --- a/TAO/tao/Servant_Base.h +++ b/TAO/tao/Servant_Base.h @@ -52,7 +52,7 @@ protected: // Copy constructor, protected so no instances can be created. virtual CORBA::Boolean _is_a (const char* logical_type_id, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Local implementation of the CORBA::Object::_is_a method. virtual void _dispatch (CORBA::ServerRequest &request, diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h index ea4e26caa9d..3665a9a8952 100644 --- a/TAO/tao/Server_Request.h +++ b/TAO/tao/Server_Request.h @@ -184,7 +184,7 @@ public: // = Initialization and termination methods. IIOP_ServerRequest (TAO_InputCDR &input, TAO_OutputCDR &output, - TAO_ORB_Core *orb_core, + TAO_ORB_Core *orb_core, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Constructor IIOP_ServerRequest (CORBA::ULong &request_id, diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h index 0ee14aee3fd..1c61d2b23d1 100644 --- a/TAO/tao/TAO.h +++ b/TAO/tao/TAO.h @@ -5,61 +5,61 @@ // // = LIBRARY // tao -// +// // = FILENAME // tao.h // // = DESCRIPTION -// Externally visible TAO extensions. +// Externally visible TAO extensions. // // = AUTHOR // Chris Cleeland -// +// // ============================================================================ #ifndef TAO_H -#define TAO_H +#define TAO_H #include "tao/corba.h" class TAO_Export TAO_ORB_Manager { // = TITLE - // Helper class for simple ORB/POA initialization and + // Helper class for simple ORB/POA initialization and // registering servants with the POA. public: // = Initialization and termination methods. TAO_ORB_Manager (CORBA::ORB_ptr orb = 0, PortableServer::POA_ptr poa = 0, - PortableServer::POAManager_ptr poa_manager = 0); + PortableServer::POAManager_ptr poa_manager = 0); // Constructor. ~TAO_ORB_Manager (void); // Destructor. - - int init (int& argc, + + int init (int& argc, char *argv[], CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Initialize the ORB/root POA, using the supplied command line // arguments or the default ORB components. Returns -1 on failure. - + int init_child_poa (int& argc, - char *argv[], - char *poa_name, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + char *argv[], + char *poa_name, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Creates a child poa under the root poa with PERSISTENT and // USER_ID policies. Call this if you want a <child_poa> with the // above policies, otherwise call init. Returns -1 on failure. - + CORBA::String activate (PortableServer::Servant servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Activate <servant>, using the POA <activate_object> call. Users // can call this method multiple times to activate multiple objects. // Returns 0 on failure. - + CORBA::String activate_under_child_poa (const char *servant_name, - PortableServer::Servant servant, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + PortableServer::Servant servant, + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Precondition: init_child_poa has been called. Activate <servant> // using the POA <activate_object_with_id> created from the string // servant_name. Users should call this to activate objects under @@ -69,7 +69,7 @@ public: ACE_Time_Value *tv = 0); // Run the ORB event loop with the specified <tv> time value Returns // -1 on failure. - + CORBA::ORB_ptr orb (void); // Accessor which returns the ORB pointer. @@ -78,11 +78,11 @@ public: PortableServer::POA_ptr child_poa (void); // Accessor which returns the child poa - + protected: CORBA::ORB_var orb_; // The ORB. - + PortableServer::POA_var poa_; // The POA for this ORB. @@ -92,7 +92,7 @@ protected: PortableServer::POAManager_var poa_manager_; // The POA manager of poa_. }; - + class TAO_Export TAO { // = TITLE diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h index 9dd77ebfe77..0ba63c68061 100644 --- a/TAO/tao/TAO_Internal.h +++ b/TAO/tao/TAO_Internal.h @@ -5,7 +5,7 @@ // // = LIBRARY // TAO -// +// // = FILENAME // TAO_Internal.h // @@ -14,7 +14,7 @@ // // = AUTHOR // Chris Cleeland -// +// // ============================================================================ #ifndef TAO_INTERNAL_H @@ -49,7 +49,7 @@ protected: // of loading services found in a file, then you should change the // code in here in order to get service entries into the service // repository. - + private: TAO_Internal (void); // Private CTOR prevents this class from being instantiated. diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h index b59ed47a08e..dc801dc2290 100644 --- a/TAO/tao/Timeprobe.h +++ b/TAO/tao/Timeprobe.h @@ -11,4 +11,8 @@ #include "ace/Timeprobe.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #endif /* TAO_TIMEPROBE_H */ diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 3a004f10b6f..903a26779b9 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -92,7 +92,7 @@ public: CORBA::Boolean equivalent (CORBA::TypeCode_ptr, CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; - // Unaliases receiver and argument before comparing. + // Unaliases receiver and argument before comparing. CORBA::TCKind kind (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // For all TypeCode kinds, returns the "kind" of the typecode. diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 356cf1d27de..fe805f57f85 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -30,6 +30,11 @@ // ACE specific includes #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "ace/SOCK_Stream.h" diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h index 3a93c1f85bd..b5ae4428af7 100644 --- a/TAO/tao/debug.h +++ b/TAO/tao/debug.h @@ -6,7 +6,7 @@ // // = LIBRARY // TAO -// +// // = FILENAME // debug.h // @@ -15,11 +15,11 @@ // // = AUTHOR // Copyright 1994-1995 by Sun Microsystems Inc. -// +// // ============================================================================ #ifndef TAO_DEBUG_H -#define TAO_DEBUG_H +#define TAO_DEBUG_H // These are global to simplify is use by other code, very much in // particular by getopt and related argument-parsing code @@ -28,7 +28,7 @@ // such as process initialization. They're treated as immutable. // 0 to ??; higher == more -extern TAO_Export u_int TAO_debug_level; +extern TAO_Export u_int TAO_debug_level; // debug messages on (1) or off (0) extern TAO_Export u_int TAO_orbdebug; @@ -46,35 +46,35 @@ extern TAO_Export char *TAO_debug_filter; #include <string.h> // 1, 2, 3 argument messages -- generic -#define dmsg(s) { if (TAO_debug_level) dmsg_v (s); } -#define dmsg1(s,a1) { if (TAO_debug_level) dmsg_v (s, a1); } -#define dmsg2(s,a1,a2) { if (TAO_debug_level) dmsg_v (s, a1, a2); } +#define dmsg(s) { if (TAO_debug_level) dmsg_v (s); } +#define dmsg1(s,a1) { if (TAO_debug_level) dmsg_v (s, a1); } +#define dmsg2(s,a1,a2) { if (TAO_debug_level) dmsg_v (s, a1, a2); } // dump CORBA_Exception, if any, with id tag -#define dexc(env,s) { if (TAO_debug_level && env.exception ()) \ - _dmsg_x (env, s); } +#define dexc(env,s) { if (TAO_debug_level && env.exception ()) \ + _dmsg_x (env, s); } // dump POSIX error indication, if any, with ID tag -#define dperror(str) { if (TAO_debug_level) dmsg_v ("%s: %s", \ - str, strerror (errno)); } +#define dperror(str) { if (TAO_debug_level) dmsg_v ("%s: %s", \ + str, strerror (errno)); } // dump socket error indication, if any, with ID tag #if defined (_WINSOCKAPI_) -#define dsockerr(s) { if (TAO_debug_level) dmsg_v ("%s: winsock error %d", \ +#define dsockerr(s) { if (TAO_debug_level) dmsg_v ("%s: winsock error %d", \ s, WSAGetLastError()); } #else -#define dsockerr(s) dperror(s) +#define dsockerr(s) dperror(s) #endif /* _WINSOCKAPI_ */ -#else /* !DEBUG */ +#else /* !DEBUG */ #define dmsg(s) { } #define dmsg1(s,a1) { } #define dmsg2(s,a1,a2) { } #define dexc(env, s) { } -#define dperror(s) { } -#define dsockerr(s) { } -#endif /* DEBUG */ +#define dperror(s) { } +#define dsockerr(s) { } +#endif /* DEBUG */ // These don't compile out; you must #ifdef them. This is done // intentionally since CPP macros have severe limits, and varargs _(or @@ -94,7 +94,7 @@ extern void TAO_Export dmsg_filter (const char *filter, // Filter according to TAO_debug_level instead of category. (For // speed, test against TAO_debug_level directly.) -extern void TAO_Export dmsg_filter (u_int level, +extern void TAO_Export dmsg_filter (u_int level, const char *fmt, ...); diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index 1049c05036b..4d45819f211 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -123,7 +123,7 @@ protected: TAO_Object_Table_Impl *create_user_id_policy_object_table (void); TAO_Object_Table_Impl *create_system_id_policy_object_table (void); TAO_Object_Table_Impl *create_object_table_i (TAO_Demux_Strategy table_type); - + u_long thread_flags_; // Default thread flags passed to thr_create(). diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 89ddd971edf..c1a4efd5343 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -25,6 +25,10 @@ #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if !defined (TAO_REACTOR) #define TAO_REACTOR ACE_Select_Reactor #endif /* TAO_REACTOR */ diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h index 818817476b5..cedac8b7a99 100644 --- a/TAO/tao/singletons.h +++ b/TAO/tao/singletons.h @@ -5,7 +5,7 @@ // // = LIBRARY // TAO -// +// // = FILENAME // singletons.h // @@ -17,7 +17,7 @@ // // = COPYRIGHT // Copyright 1997 -// +// // ============================================================================ #ifndef TAO_SINGLETONS_H diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h index 412a4ecfd75..611ba23c473 100644 --- a/TAO/tao/try_macros.h +++ b/TAO/tao/try_macros.h @@ -120,7 +120,7 @@ TAO_TRY_LABEL: \ if (TAO_TRY_FLAG) \ do { -// This serves a similar purpose as the macro above, +// This serves a similar purpose as the macro above, // The second "do" scope is for the TAO_CHECK_ENV continues. #define TAO_TRY_EX(LABEL) \ do { \ diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h index 78db5b7ffe5..b41e140fc83 100644 --- a/TAO/tao/varout.h +++ b/TAO/tao/varout.h @@ -37,7 +37,7 @@ class TAO_Object_Field_T : public TAO_Object_Field // The downcasting to the right type must be executed by classes // with compile-time knowledge of the object type. // The solution addopted in TAO is to create a special manager - // class for that field, + // class for that field, public: TAO_Object_Field_T (void); // default constructor @@ -85,7 +85,7 @@ public: // TAO extension for access to the underlying pointer. virtual void _downcast (CORBA_Object* base_ptr, - CORBA_Environment &_env = CORBA_Environment::default_environment ()); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA_Object* _upcast (void); virtual void _release (void); // Implement the TAO_Object_Field methods. @@ -703,7 +703,7 @@ public: private: T_ptr &ptr_; }; -#endif /* 0 */ +#endif /* 0 */ #if defined (__ACE_INLINE__) #include "tao/varout.i" |