diff options
Diffstat (limited to 'TAO/tao')
40 files changed, 1588 insertions, 968 deletions
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 7332fa15a02..9b69de99473 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -271,19 +271,19 @@ public: // extract an object reference // the following are unsafe operations - // ORBOS/90-01-11, pg 672: For C++ mapping using the CORBA::Environment + // ORBOS/90-01-11, pg 672: For C++ mapping using the CORBA_Environment // parameter, two forms of the replace method are provided. void replace (CORBA::TypeCode_ptr type, const void *value, CORBA::Boolean any_owns_data, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Replace the current typecode and data with the specified one - // unsafe. void replace (CORBA::TypeCode_ptr type, const void *value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Replace the current typecode and data with the specified one - // unsafe. This uses a default value for the "any_owns_data" parameter diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index c3488e2f91f..9f532daf36e 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -242,7 +242,7 @@ public: CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Append the contents of the CDR stream based on information // described by <tc>; returning any errors in <env>. @@ -278,7 +278,7 @@ public: CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Marshalls the contents of <data> as described by the TypeCode in // <tc>. Any errors are reported though the <env> parameter. @@ -480,7 +480,7 @@ public: CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Demarshall the contents of the CDR stream into <data> as // described by <tc>; returning any errors in <env>. @@ -510,7 +510,7 @@ public: // Return CORBA::B_FALSE on failure and CORBA::B_TRUE on success. CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Skip the contents of the CDR stream based on information // described by <tc>; returning any errors in <env>. diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h index 891d020f0aa..d07b7c482ce 100644 --- a/TAO/tao/Connect.h +++ b/TAO/tao/Connect.h @@ -121,7 +121,7 @@ public: TAO_OutputCDR &response, CORBA::Boolean &response_required, CORBA::ULong &request_id, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Handle processing of the request residing in <msg>, setting // <response_required> to zero if the request is for a oneway or // non-zero if for a two-way and <response> to any necessary @@ -133,7 +133,7 @@ protected: TAO_OutputCDR &response, CORBA::Boolean &response_required, CORBA::ULong &request_id, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Handle processing of the location request residing in <msg>, // setting <response_required> to one if no errors are encountered. // The LocateRequestReply is placed into <response>. In case of diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index 3d354d0ccc9..2736188b3eb 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -107,11 +107,11 @@ class CORBA_Current : public virtual ACE_CORBA_1 (Object) public: // the static operations static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj); - static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA_Current_ptr _nil (void); virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp new file mode 100644 index 00000000000..4f24429527c --- /dev/null +++ b/TAO/tao/Environment.cpp @@ -0,0 +1,149 @@ +// $Id$ + +#include "tao/corba.h" + +#if !defined (__ACE_INLINE__) +# include "tao/Environment.i" +#endif /* __ACE_INLINE__ */ + +ACE_RCSID(tao, Environment, "$Id$") + +CORBA_Environment::CORBA_Environment (void) + : exception_ (0), + previous_ (TAO_ORB_Core_instance ()->default_environment ()) +{ + TAO_ORB_Core_instance ()->default_environment (this); +} + +CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core) + : exception_ (0), + previous_ (orb_core->default_environment ()) +{ + orb_core->default_environment (this); +} + +CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs) + : exception_ (rhs.exception_), + previous_ (TAO_ORB_Core_instance ()->default_environment ()) +{ + TAO_ORB_Core_instance ()->default_environment (this); + exception_->_incr_refcnt (); +} + +CORBA_Environment& +CORBA_Environment::operator= (const CORBA_Environment& rhs) +{ + if (this != &rhs) + { + this->clear (); + this->exception (rhs.exception_); + } + return *this; +} + +CORBA_Environment::~CORBA_Environment (void) +{ + this->clear (); + TAO_ORB_Core_instance ()->default_environment (this->previous_); +} + +void +CORBA_Environment::exception (CORBA_Exception *ex) +{ + if (ex != this->exception_) + { + this->clear (); + this->exception_ = ex; + this->exception_->_incr_refcnt (); + } +#if defined (TAO_USE_EXCEPTIONS) + ex->_raise (); +#endif /* TAO_USE_EXCEPTIONS */ +} + +void +CORBA_Environment::clear (void) +{ + if (this->exception_) + this->exception_->_decr_refcnt (); + + this->exception_ = 0; +} + +CORBA_Environment& +CORBA_Environment::default_environment () +{ + return *TAO_ORB_Core_instance ()->default_environment (); +} + +// Convenience -- say if the exception is a system exception or not. + +int +CORBA::Environment::exception_type (void) const +{ + static char sysex_prefix [] = "IDL:omg.org/CORBA/"; + static char typecode_extra [] = "TypeCode/"; + static char poa_prefix [] = "IDL:PortableServer/"; + + if (!this->exception_) + return CORBA::NO_EXCEPTION; + + // All exceptions currently (CORBA 2.0) defined in the CORBA + // scope are system exceptions ... except for a couple that + // are related to TypeCodes. + + const char *id = this->exception_->_id (); + + if ((ACE_OS::strncmp (id, sysex_prefix, sizeof sysex_prefix - 1) == 0 + && ACE_OS::strncmp (id + sizeof sysex_prefix - 1, + typecode_extra, sizeof typecode_extra - 1) != 0) + || ACE_OS::strncmp (id, poa_prefix, sizeof poa_prefix - 1) == 0) + return CORBA::SYSTEM_EXCEPTION; + + return CORBA::USER_EXCEPTION; +} + +// Diagnostic utility routine: describe the exception onto the +// standard I/O stream passed as a parameter. + +void +CORBA::Environment::print_exception (const char *info, + FILE *) const +{ + const char *id = this->exception_->_id (); + + ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info)); + + // @@ get rid of this logic, and rely on some member function on + // Exception to say if it's user or system exception. + + if (this->exception_type () == CORBA::SYSTEM_EXCEPTION) + { + CORBA::SystemException *x2 = + CORBA_SystemException::_narrow (this->exception_); + + // @@ there are a other few "user exceptions" in the CORBA + // scope, they're not all standard/system exceptions ... really + // need to either compare exhaustively against all those IDs + // (yeech) or (preferably) to represent the exception type + // directly in the exception value so it can be queried. + + ACE_DEBUG ((LM_ERROR, + "(%P|%t) system exception, ID '%s'\n", + id)); + ACE_DEBUG ((LM_ERROR, + "(%P|%t) minor code = %x, completed = %s\n", + x2->minor (), + (x2->completion () == CORBA::COMPLETED_YES) ? "YES" : + (x2->completion () == CORBA::COMPLETED_NO) ? "NO" : + (x2->completion () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : + "garbage")); + } + else + // @@ we can use the exception's typecode to dump all the data + // held within it ... + + ACE_DEBUG ((LM_ERROR, + "(%P|%t) user exception, ID '%s'\n", + id)); +} diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h new file mode 100644 index 00000000000..49f4f8a424c --- /dev/null +++ b/TAO/tao/Environment.h @@ -0,0 +1,117 @@ +// This may look like C, but it's really -*- C++ -*- +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO +// +// = FILENAME +// Environment.h +// +// = DESCRIPTION +// Declare the CORBA_Environment class. +// Note that this header file only requires a few forward +// declarations of CORBA classes, this is *very* important because +// even the ORB needs to know about it; make your changes with care. +// It is also a good idea trying to minimize cross dependencies +// between header files. +// +// = AUTHOR +// Carlos O'Ryan +// +// ============================================================================ + +#if !defined (TAO_ENVIRONMENT_H) +# define TAO_ENVIRONMENT_H + +class CORBA_Exception; +class TAO_ORB_Core; + +class TAO_Export CORBA_Environment +{ + // = TITLE + // CORBA_Environment + // + // = 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: + // if the user creates a new environment the old one is "pushed" + // (actually the new one remembers it), eventually the new + // environment destructor pops itself from the stack and we + // recover the old environment. + // This means that if the user create a new environment and + // somebody calls a function using the default one the exception + // will still be received in the environment created by the user. + // The only drawback is that environments life time must nest + // properly, this shouldn't be a problem because environments are + // usually created on the stack, but, the spec allows their + // creation on the heap and/or as class members; we need to + // investigate the tradeoffs and take a decision. + // +public: + // = Initialization and termination methods. + + CORBA_Environment (void); + // The default constructor, the environment will hold no + // exceptions. + + CORBA_Environment (const CORBA_Environment &env); + // Copy constructor + + CORBA_Environment &operator=(const CORBA_Environment& env); + // Assingment + + ~CORBA_Environment (void); + // Destructor, release the exception. + + CORBA_Exception* exception (void) const; + // Return the exception. Caller must call _incr_refcnf() in order + // to keep the ptr. + + void exception (CORBA_Exception *ex); + // Set the exception to <ex>, taking a reference on it. + + int exception_type (void) const; + // Return if the exception is a user exception or a system + // exception. + + const char* exception_id (void) const; + // return the repository ID for the exception + + void clear (void); + // Clear the exception. + + void print_exception (const char *info, + FILE *f=stdout) const; + // print the exception to output determined by f + + // = Obtain a default environment to use with TAO. + static CORBA_Environment &default_environment(); + +private: + friend class TAO_ORB_Core; + CORBA_Environment (TAO_ORB_Core *orb_core); + // Initialize using a well known ORB Core; this is intended for the + // bootstraping of the ORB_Core, not for general consumption. + +private: + CORBA_Exception* exception_; + // Pointer to the exception object contained in the environment. + + CORBA_Environment* previous_; + // The previous environment on the "default environment stack". +}; + +#if defined (__ACE_INLINE__) +# include "tao/Environment.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_EXCEPTION_H */ diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i new file mode 100644 index 00000000000..2411dde95ea --- /dev/null +++ b/TAO/tao/Environment.i @@ -0,0 +1,9 @@ +// This may look like C, but it's really -*- C++ -*- +// $Id$ + +ACE_INLINE CORBA_Exception* +CORBA_Environment::exception (void) const +{ + return this->exception_; +} + diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index ffa70a07758..452c3c92dc0 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -23,38 +23,7 @@ CORBA::ExceptionList *TAO_Exceptions::system_exceptions; // TAO specific typecode extern CORBA::TypeCode_ptr TC_completion_status; -void -CORBA_Environment::exception (CORBA::Exception *ex) -{ - if (ex != this->exception_) - { - this->clear (); - this->exception_ = ex; - this->exception_->_incr_refcnt (); - } -#if defined (TAO_USE_EXCEPTIONS) - ex->_raise (); -#endif /* TAO_USE_EXCEPTIONS */ -} - -CORBA_Environment::~CORBA_Environment (void) -{ - this->clear (); -} - -void -CORBA_Environment::clear (void) -{ - if (this->exception_) - this->exception_->_decr_refcnt (); - - this->exception_ = 0; -} - -CORBA_Environment::CORBA_Environment (void) - : exception_ (0) -{ -} +// **************************************************************** CORBA_Exception::CORBA_Exception (CORBA::TypeCode_ptr tc) : type_ (CORBA::TypeCode::_duplicate (tc)), @@ -581,78 +550,6 @@ STANDARD_EXCEPTION_LIST #undef POA_EXCEPTION_LIST #undef STANDARD_EXCEPTION_LIST -// Convenience -- say if the exception is a system exception or not. - -CORBA::ExceptionType -CORBA::Environment::exception_type (void) const -{ - static char sysex_prefix [] = "IDL:omg.org/CORBA/"; - static char typecode_extra [] = "TypeCode/"; - static char poa_prefix [] = "IDL:PortableServer/"; - - if (!this->exception_) - return CORBA::NO_EXCEPTION; - - // All exceptions currently (CORBA 2.0) defined in the CORBA - // scope are system exceptions ... except for a couple that - // are related to TypeCodes. - - const char *id = this->exception_->_id (); - - if ((ACE_OS::strncmp (id, sysex_prefix, sizeof sysex_prefix - 1) == 0 - && ACE_OS::strncmp (id + sizeof sysex_prefix - 1, - typecode_extra, sizeof typecode_extra - 1) != 0) - || ACE_OS::strncmp (id, poa_prefix, sizeof poa_prefix - 1) == 0) - return CORBA::SYSTEM_EXCEPTION; - - return CORBA::USER_EXCEPTION; -} - -// Diagnostic utility routine: describe the exception onto the -// standard I/O stream passed as a parameter. - -void -CORBA::Environment::print_exception (const char *info, - FILE *) const -{ - const char *id = this->exception_->_id (); - - ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info)); - - // @@ get rid of this logic, and rely on some member function on - // Exception to say if it's user or system exception. - - if (this->exception_type () == CORBA::SYSTEM_EXCEPTION) - { - CORBA::SystemException *x2 = - CORBA_SystemException::_narrow (this->exception_); - - // @@ there are a other few "user exceptions" in the CORBA - // scope, they're not all standard/system exceptions ... really - // need to either compare exhaustively against all those IDs - // (yeech) or (preferably) to represent the exception type - // directly in the exception value so it can be queried. - - ACE_DEBUG ((LM_ERROR, - "(%P|%t) system exception, ID '%s'\n", - id)); - ACE_DEBUG ((LM_ERROR, - "(%P|%t) minor code = %x, completed = %s\n", - x2->minor (), - (x2->completion () == CORBA::COMPLETED_YES) ? "YES" : - (x2->completion () == CORBA::COMPLETED_NO) ? "NO" : - (x2->completion () == CORBA::COMPLETED_MAYBE) ? "MAYBE" : - "garbage")); - } - else - // @@ we can use the exception's typecode to dump all the data - // held within it ... - - ACE_DEBUG ((LM_ERROR, - "(%P|%t) user exception, ID '%s'\n", - id)); -} - CORBA_ExceptionList::CORBA_ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list) { diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 8bb1380582f..f01338e1f7d 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -248,53 +248,6 @@ private: CORBA_Any* exception_; }; -class TAO_Export CORBA_Environment -{ - // = TITLE - // CORBA_Environment - // - // = 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. -public: - // = Initialization and termination methods. - CORBA_Environment (void); - // ctor - - ~CORBA_Environment (void); - // dtor - - CORBA::Exception_ptr exception (void) const; - // Return the exception. Caller must call _incr_refcnf() in order - // to keep the ptr. - - void exception (CORBA::Exception *ex); - // Set the exception to <ex>, taking a reference on it. - - CORBA::ExceptionType exception_type (void) const; - // Return if the exception is a user exception or a system - // exception. - - TAO_CONST CORBA::String exception_id (void) const; - // return the repository ID for the exception - - void clear (void); - // Clear the exception. - - void print_exception (const char *info, - FILE *f=stdout) const; - // print the exception to output determined by f - -private: - CORBA::Exception_ptr exception_; - // Pointer to the exception object contained in the environment. - - // = These are not provided. - CORBA_Environment (const CORBA_Environment &src); - CORBA_Environment &operator = (const CORBA_Environment &src); -}; class TAO_Export TAO_Exceptions { @@ -306,17 +259,17 @@ public: const char *name, char *buffer, size_t buflen, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Make the TypeCode for a standard exception. When used // correctly, initializing system exceptions is only an exercise // in CPU time; it allocates no new memory. static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Make the TypeCode for the CORBA::UnknownUserException standard // exception. - static void init (CORBA::Environment &env); + static void init (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Runtime initialization of all standard exception typecodes. // Called from <CORBA::ORB_init>. @@ -324,7 +277,7 @@ public: // Runtime finalization of all standard exception typecodes. static CORBA_Exception *create_system_exception (const char* id, - CORBA::Environment& env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Create a CORBA::SystemException given the interface repository // ID. @@ -366,10 +319,10 @@ public: void add_consume (CORBA::TypeCode_ptr tc); // add and consume a TypeCode to the list - CORBA::TypeCode_ptr item (CORBA::ULong index, CORBA::Environment &env); + CORBA::TypeCode_ptr item (CORBA::ULong index, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // return the typecode at index i. Raises the "Bounds" exception - void remove (CORBA::ULong index, CORBA::Environment &env); + void remove (CORBA::ULong index, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // remove the typecode at index i. Raises the "Bounds" exception private: diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index aa844e3b421..0f38c0ac492 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -38,12 +38,6 @@ CORBA_SystemException::completion (CORBA::CompletionStatus c) } ACE_INLINE -CORBA::Exception_ptr CORBA_Environment::exception (void) const -{ - return this->exception_; -} - -ACE_INLINE CORBA_ExceptionList::CORBA_ExceptionList (void) { } diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h index 2d16c470c52..de896dc399d 100644 --- a/TAO/tao/Forwarding_Servant.h +++ b/TAO/tao/Forwarding_Servant.h @@ -32,14 +32,14 @@ public: // Constructor virtual void invoke (CORBA::ServerRequest_ptr request, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // The invoke() method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing // necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // The _primary_interface() method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h index 575f4397dd5..be32428bf5b 100644 --- a/TAO/tao/GIOP.h +++ b/TAO/tao/GIOP.h @@ -251,7 +251,7 @@ public: // Constructor CORBA::Boolean init (TAO_InputCDR &msg, - CORBA::Environment& env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Initialize the header from the values found in <msg>. CORBA::ULong request_id; diff --git a/TAO/tao/IIOP_Interpreter.h b/TAO/tao/IIOP_Interpreter.h index a9a5d4a4782..1dd0cda5691 100644 --- a/TAO/tao/IIOP_Interpreter.h +++ b/TAO/tao/IIOP_Interpreter.h @@ -23,7 +23,7 @@ // Useful typedefs. typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *); class TAO_Export TAO_IIOP_Interpreter @@ -104,12 +104,12 @@ public: static size_t calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, TAO_InputCDR *original_stream, size_t &alignment, - CORBA::Environment &env); + 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 &_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: @@ -142,7 +142,7 @@ public: static size_t calc_struct_and_except_attributes (TAO_InputCDR *stream, size_t &alignment, CORBA::Boolean is_exception, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Given typecode bytes for a structure (or exception), figure out // its alignment and size; return size, alignment is an 'out' // parameter. Only "CORBA::tk_struct" (or "CORBA::tk_except") has @@ -160,14 +160,14 @@ public: static size_t calc_struct_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculate size and alignment for a structure. #if defined (TAO_NO_COPY_OCTET_SEQUENCES) static size_t calc_seq_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + 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. @@ -175,13 +175,13 @@ public: static size_t calc_exception_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculate size and alignment for an exception. static size_t calc_union_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculate size and alignment for a CORBA discriminated union. // // Note that this is really a two-element structure. The first @@ -193,12 +193,12 @@ public: static size_t calc_alias_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculate size and alignment for a typedeffed type. static size_t calc_array_attributes (TAO_InputCDR *stream, size_t &alignment, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculate size and alignment of an array. (All such arrays are // described as single dimensional, even though the IDL definition // may specify a multidimensional array ... such arrays are treated @@ -207,14 +207,14 @@ public: static CORBA::Boolean match_value (CORBA::TCKind kind, TAO_InputCDR *tc_stream, const void *value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Cast the discriminant values to the right type and compare them. static size_t calc_key_union_attributes (TAO_InputCDR *stream, size_t &overall_alignment, size_t &discrim_size_with_pad, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // = Utility routines that skip unneeded parameter lists. static CORBA::Boolean skip_encapsulation (TAO_InputCDR *stream); diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h index 3a294737cea..8e1b9540f09 100644 --- a/TAO/tao/IIOP_ORB.h +++ b/TAO/tao/IIOP_ORB.h @@ -37,11 +37,11 @@ public: // destructor CORBA::Object_ptr string_to_object (CORBA::String str, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Get an object reference from the IOR string. CORBA::String object_to_string (CORBA::Object_ptr obj, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Convert an object reference to an IOR stringified form. TAO_ServantBase *_get_collocated_servant (STUB_Object *sobj); diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h index b2b32f1cf92..fa236b6f905 100644 --- a/TAO/tao/IIOP_Object.h +++ b/TAO/tao/IIOP_Object.h @@ -142,7 +142,7 @@ class TAO_Export IIOP_Object : public STUB_Object // interpreter that let static stubs be very small. It's // specific to objrefs with IIOP::Profile. public: - virtual void do_static_call (CORBA::Environment &env, + virtual void do_static_call (CORBA_Environment &env, const TAO_Call_Data *info, void** args); // SII-based "Stub interpreter" for static stubs. IDL compiler just @@ -155,7 +155,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList &exceptions, - CORBA::Environment &env); + 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, @@ -164,11 +164,11 @@ public: // = Support for tables keyed by objrefs. CORBA::ULong hash (CORBA::ULong maximum, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Compute a hash value for the object. CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // XXX All objref representations should know how to marshal // themselves. That will involve ensuring that the IOR that gets // marshaled talks a specific protocol, otherwise the target of a @@ -203,7 +203,7 @@ public: virtual CORBA::ULong _incr_refcnt (void); virtual CORBA::ULong _decr_refcnt (void); - virtual TAO_ObjectKey *key (CORBA::Environment &env); + virtual TAO_ObjectKey *key (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Return the object key as an out parameter. Caller should release // return value when finished with it. @@ -236,7 +236,7 @@ public: // Reset the <handler_>. Usually used on errors. protected: - void put_params (CORBA::Environment &env, + void put_params (CORBA_Environment &env, const TAO_Call_Data *info, TAO_GIOP_Invocation &call, void** args); @@ -245,7 +245,7 @@ protected: void put_params (TAO_GIOP_Invocation &call, CORBA::NVList_ptr args, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Helper method to factor out common code in dynamic oneway // vs. twoway invocations. diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index 74eefd8ab4e..451b44d17c1 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -50,7 +50,7 @@ public: void put_param (CORBA::TypeCode_ptr tc, void *value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Encodes the value into the undelying CDR stream based on the // TypeCode parameter @@ -60,13 +60,13 @@ public: protected: void start (CORBA::Boolean is_roundtrip, TAO_GIOP::Message_Type message_type, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Locates the right Client_Connection_Handler and initializes the // CDR stream. // The message_type tells how to initialize the output CDR stream TAO_GIOP_ReplyStatusType invoke (CORBA::Boolean is_roundtrip, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Sends the request, does not wait for the response. TAO_GIOP_ReplyStatusType close_connection (void); @@ -74,7 +74,7 @@ protected: // we are fowarded (to the same server) TAO_GIOP_ReplyStatusType location_forward (TAO_InputCDR &inp_stream, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // do the location forwarding, which means exchanging the profile protected: @@ -115,17 +115,17 @@ public: const char *operation, TAO_ORB_Core* orb_core); - void start (CORBA::Environment &env); + void start (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calls TAO_GIOP_Invocation::start. TAO_GIOP_ReplyStatusType invoke (CORBA::ExceptionList &exceptions, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Send request, block until any reply comes back, and unmarshal // reply parameters as appropriate. TAO_GIOP_ReplyStatusType invoke (TAO_Exception_Data *excepts, CORBA::ULong except_count, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Special purpose invoke method used by the stubs. This // accomplishes the same task as the normal invoke except that // Exceptions are allocated and decoded here. This keeps the size of @@ -133,7 +133,7 @@ public: void get_value (CORBA::TypeCode_ptr tc, void *value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // No CORBA::Context support (deprecated). TAO_InputCDR &inp_stream (void); @@ -155,10 +155,10 @@ public: const char *operation, TAO_ORB_Core* orb_core); - void start (CORBA::Environment &env); + void start (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Call TAO_GIOP_Invocation::start() - TAO_GIOP_ReplyStatusType invoke (CORBA::Environment &env); + TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Send request, without blocking for any response. }; @@ -173,10 +173,10 @@ public: TAO_GIOP_Locate_Request_Invocation (IIOP_Object *data, TAO_ORB_Core* orb_core); - void start (CORBA::Environment &env); + void start (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calls TAO_GIOP_Invocation::start. - TAO_GIOP_ReplyStatusType invoke (CORBA::Environment &env); + TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Send request, without blocking for any response. private: diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index a41e9fea323..37b963a158e 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -21,6 +21,7 @@ ORBCORE_SRCS = \ CurrentC \ CurrentS \ Exception \ + Environment \ Forwarding_Servant \ NVList \ Object \ @@ -227,14 +228,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -275,6 +276,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -299,6 +302,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -449,14 +455,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -497,6 +503,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -521,6 +529,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -670,14 +681,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -718,6 +729,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -743,6 +756,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -893,14 +909,241 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h +.obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -941,6 +1184,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -965,6 +1210,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1116,14 +1364,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -1164,6 +1412,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -1188,6 +1438,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1338,14 +1591,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -1386,6 +1639,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -1410,6 +1665,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1560,14 +1818,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -1608,6 +1866,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -1632,6 +1892,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1782,14 +2045,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -1830,6 +2093,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -1854,6 +2119,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2011,14 +2279,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2059,6 +2327,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -2083,6 +2353,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2239,14 +2512,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2287,6 +2560,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -2311,6 +2586,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2461,14 +2739,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2509,6 +2787,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -2533,6 +2813,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2683,14 +2966,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2731,6 +3014,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -2755,6 +3040,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2905,14 +3193,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2953,6 +3241,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -2977,6 +3267,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -3127,14 +3420,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -3175,6 +3468,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -3199,6 +3494,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -3349,14 +3647,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -3397,6 +3695,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -3421,6 +3721,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -3571,14 +3874,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -3619,6 +3922,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -3643,6 +3948,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -3793,14 +4101,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -3841,6 +4149,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -3865,6 +4175,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -4017,14 +4330,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4065,6 +4378,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -4089,6 +4404,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -4239,14 +4557,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4287,6 +4605,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -4311,6 +4631,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -4461,14 +4784,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4509,6 +4832,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -4533,6 +4858,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -4683,14 +5011,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4731,6 +5059,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -4755,6 +5085,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -4805,7 +5138,8 @@ endif # cxvx86 $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h + $(TAO_ROOT)/tao/singletons.h \ + $(ACE_ROOT)/ace/Timeprobe.h .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -4905,14 +5239,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4953,6 +5287,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -4977,6 +5313,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -5127,14 +5466,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5175,6 +5514,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -5199,6 +5540,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -5351,14 +5695,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5399,6 +5743,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -5423,6 +5769,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -5573,14 +5922,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5621,6 +5970,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -5645,6 +5996,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -5795,14 +6149,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5843,6 +6197,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -5867,6 +6223,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -6017,14 +6376,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -6065,6 +6424,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -6089,6 +6450,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -6240,14 +6604,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -6288,6 +6652,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -6312,6 +6678,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -6462,14 +6831,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -6510,6 +6879,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -6534,6 +6905,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -6683,14 +7057,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -6731,6 +7105,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -6755,6 +7131,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -6905,14 +7284,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -6953,6 +7332,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -6977,6 +7358,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -7127,14 +7511,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -7175,6 +7559,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -7199,6 +7585,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -7351,14 +7740,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -7399,6 +7788,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -7423,6 +7814,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -7575,14 +7969,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -7623,6 +8017,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -7647,6 +8043,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -7799,14 +8198,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -7847,6 +8246,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -7871,6 +8272,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -8021,14 +8425,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -8069,6 +8473,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -8093,6 +8499,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -8243,14 +8652,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -8291,6 +8700,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -8315,6 +8726,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -8468,14 +8882,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -8516,6 +8930,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -8540,6 +8956,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -8690,14 +9109,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -8738,6 +9157,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -8762,6 +9183,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -8912,14 +9336,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -8960,6 +9384,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -8984,6 +9410,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -9145,14 +9574,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -9193,6 +9622,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -9217,6 +9648,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -9367,14 +9801,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -9415,6 +9849,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -9439,6 +9875,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -9589,14 +10028,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -9637,6 +10076,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -9661,6 +10102,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -9813,14 +10257,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -9861,6 +10305,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -9885,6 +10331,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -10040,10 +10489,10 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -10084,6 +10533,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -10108,6 +10559,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -10258,14 +10712,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -10306,6 +10760,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -10330,6 +10786,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -10480,14 +10939,14 @@ endif # cxvx86 $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -10528,6 +10987,8 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ @@ -10552,6 +11013,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/varout.h \ + $(TAO_ROOT)/tao/varout.i \ + $(TAO_ROOT)/tao/varout.cpp \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h index a2a6b2e72df..533b647e466 100644 --- a/TAO/tao/Marshal.h +++ b/TAO/tao/Marshal.h @@ -24,13 +24,13 @@ CORBA::TypeCode::traverse_status DEEP_COPY (CORBA::TypeCode_ptr param, const void *source, const void *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); CORBA::TypeCode::traverse_status DEEP_FREE (CORBA::TypeCode_ptr param, const void *source, const void *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // = Forward declarations. class TAO_Marshal_Object; @@ -62,7 +62,7 @@ public: // destructor virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Factory method that returns the appropriate marshal object. private: @@ -107,25 +107,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // encoding operation virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // decoding operation virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // append operation TAO_Marshal_Object (void); @@ -150,25 +150,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -188,25 +188,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *source, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -226,25 +226,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -264,25 +264,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -302,25 +302,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -340,25 +340,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -378,25 +378,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -416,25 +416,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -454,25 +454,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -492,25 +492,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -530,25 +530,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -567,25 +567,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; @@ -604,25 +604,25 @@ public: const void *data, const void *, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc, const void *data, const void *parent_typecode, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc, const void *data, const void *, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // skip operation virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, TAO_OutputCDR *dest, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // append operation }; diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index cd2fab107e0..ea2ddc39131 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -168,38 +168,38 @@ public: // return the current number of elements in the list CORBA_NamedValue_ptr add (CORBA::Flags, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // add an element and just initialize the flags CORBA_NamedValue_ptr add_item (const char *, CORBA::Flags, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // add an element and initialize its name and flags CORBA_NamedValue_ptr add_value (const char *, const CORBA::Any &, CORBA::Flags, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // initializes a value, name, and flags CORBA_NamedValue_ptr add_item_consume (char *, CORBA::Flags, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // just like add_item. In addition, memory management of char * name is taken // over by the NVList CORBA_NamedValue_ptr add_value_consume (char *, CORBA::Any_ptr, CORBA::Flags, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // just like add_value. In addition, the NVList controls the memory // management of the char *name and Any *value parameter - CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA::Environment &env); + CORBA_NamedValue_ptr item (CORBA::ULong n, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // retrieve the item at the nth location. Raises Bounds // CORBA::Status - void remove (CORBA::ULong n, CORBA::Environment &env); + void remove (CORBA::ULong n, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // remove element at index n. Raises Bounds // The pseudo object static methods.. @@ -215,7 +215,7 @@ private: // constructor - cannot be instantiated directly other than through the // ORB::create_list method - CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA::Environment &); + CORBA_NamedValue_ptr add_element (CORBA::Flags, CORBA_Environment &_env = CORBA_Environment::default_environment ()); // helper to increase the list size. This is used by all the add_ methods of // the NVList class diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index d0d04e63228..7eba409f428 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -821,12 +821,12 @@ public: // can be used for initialization or in comparisons. virtual CORBA::Object_ptr string_to_object (CORBA::String str, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Turn a string-ified object reference back into an object pointer. // Each type of ORB, e.g. an IIOP ORB, must implement this. // Typically these strings are created using <object_to_string()>. virtual CORBA::String object_to_string (CORBA::Object_ptr obj, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Turn an object reference into a string. Each type of ORB, // e.g. an IIOP ORB, must implement this. This can be used by // servers to publish their whereabouts to clients. The output of @@ -907,13 +907,13 @@ public: STUB_Object *create_stub_object (const TAO_ObjectKey &key, const char *type_id, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Makes sure that the ORB is open and then creates an IIOP object // based on the endpoint. CORBA_Object_ptr key_to_object (const TAO_ObjectKey &key, const char *type_id, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Convert key into an object reference. Return Object_ptr as out // parameter. Errors will come through the environment. // @@ -945,7 +945,7 @@ public: // previously-specified port for requests. Returns -1 on failure, // else 0. - static void init_orb_globals (CORBA::Environment &env); + static void init_orb_globals (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Initialize the ORB globals correctly, i.e., only when they // haven't been initialized yet. @@ -1082,17 +1082,9 @@ private: # include "tao/ORB.i" #endif /* __ACE_INLINE__ */ -// Signature of a skeleton for every operation of an interface. -typedef void (*TAO_Skeleton)(CORBA::ServerRequest &, - void *, // object_ptr - void *, // context_ptr - CORBA::Environment &); - -// NOTE: stub APIs are nonportable, and must be explicitly #included -// by code emitted from an IDL compiler. - -#if defined (_MSC_VER) -# pragma pack (pop) // VC++, goes back to other padding rules +#if defined (_MSC_VER) +// VC++, goes back to other padding rules +# pragma pack (pop) #endif /* _MSV_VER */ #endif /* TAO_ORB_H */ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 5d027161a47..941efec8f6e 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -64,7 +64,9 @@ TAO_ORB_Core::TAO_ORB_Core (void) #if defined (TAO_ARL_USES_SAME_CONNECTOR_PORT) arl_same_port_connect_ (CORBA::B_FALSE), #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */ - preconnections_ (0) + preconnections_ (0), + default_environment_ (0), + tss_environment_ (this) { } diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index a8e27afeea0..aae6025ac86 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -77,7 +77,7 @@ class TAO_Export TAO_ORB_Core friend CORBA::ORB_ptr CORBA::ORB_init (int &, char * const*, const char *, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); public: // = Initialization and termination methods. TAO_ORB_Core (void); @@ -223,6 +223,25 @@ public: // This allocator is always TSS and has no locks. It is intended for // allocating the buffers used in *outgoing* CDR streams. + CORBA_Environment *default_environment (void) const; + void default_environment (CORBA_Environment*); + // 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: if the + // user creates a new environment the old one is "pushed" (actually + // the new one remembers it), eventually the new environment + // destructor pops itself from the stack and we recover the old + // environment. + // This means that if the user create a new environment and somebody + // calls a function using the default one the exception will still + // be received in the environment created by the user. + // The only drawback is that environments life time must nest + // properly, this shouldn't be a problem because environments are + // usually created on the stack, but, the spec allows their creation + // on the heap and/or as class members; we need to investigate the + // tradeoffs and take a decision. + // + private: int init (int& argc, char ** argv); // Initialize the guts of the ORB Core. It is intended that this be @@ -326,6 +345,13 @@ private: TSS_ALLOCATOR cdr_buffer_allocator_; // The Allocator for the CDR buffers. + + CORBA_Environment* default_environment_; + // The default environment for the thread. + + CORBA_Environment tss_environment_; + // If the user (or library) provides no environment the ORB_Core + // still holds one. }; class TAO_Default_Reactor : public ACE_Reactor diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 5fd74ca3b58..ba8a1704457 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -158,3 +158,15 @@ TAO_ORB_Core::cdr_buffer_allocator (void) { return &this->cdr_buffer_allocator_; } + +ACE_INLINE CORBA_Environment* +TAO_ORB_Core::default_environment (void) const +{ + return this->default_environment_; +} + +ACE_INLINE void +TAO_ORB_Core::default_environment (CORBA_Environment* env) +{ + this->default_environment_ = env; +} diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 855b254c9d2..e2c764b277c 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 &_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 @@ -50,11 +50,11 @@ public: // making such calls, but may be overridden when it appears // appropriate. - virtual CORBA::InterfaceDef_ptr _get_interface (CORBA::Environment &); + virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Interface repository related operation virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id, - CORBA::Environment &); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // determine if we are of the type specified by the "logical_type_id" virtual const char* _interface_repository_id (void) const; @@ -68,18 +68,18 @@ public: // are we collocated with the servant? virtual CORBA::ImplementationDef_ptr - _get_implementation (CORBA::Environment &); + _get_implementation (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // This method is deprecated in the CORBA 2.2 spec, we just return 0 // every time. - virtual CORBA::Boolean _non_existent (CORBA::Environment &); + virtual CORBA::Boolean _non_existent (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void _create_request (const CORBA::Char *operation, CORBA::NVList_ptr arg_list, CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, CORBA::Flags req_flags, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // DII operation to create a request. // // The mapping for create_request is split into two forms, @@ -91,11 +91,11 @@ public: // calls above ... that's how it can have a default implementation. virtual CORBA::Request_ptr _request (const CORBA::Char *operation, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // DII operation to create a request. virtual CORBA::ULong _hash (CORBA::ULong maximum, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Return a (potentially non-unique) hash value for this object. // This method relies on the representation of the object // reference's private state. Since that changes easily (when @@ -103,7 +103,7 @@ public: // implementation. virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Try to determine if this object is the same as <other_obj>. This // method relies on the representation of the object reference's // private state. Since that changes easily (when different ORB @@ -124,7 +124,7 @@ public: virtual ~CORBA_Object (void); // destructor - virtual TAO_ObjectKey *_key (CORBA::Environment &env); + virtual TAO_ObjectKey *_key (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Return the object key as an out parameter. Caller should release // return value when finished with it. @@ -228,7 +228,7 @@ public: // destructor virtual void _downcast (CORBA_Object* base_ptr, - CORBA_Environment& env) = 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/POA.h b/TAO/tao/POA.h index 7c12fbe10dd..5f63f0b2e4f 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -58,15 +58,15 @@ public: TAO_Thread_Policy (const TAO_Thread_Policy &new_policy); - virtual PortableServer::ThreadPolicyValue value (CORBA::Environment &env); + virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::ThreadPolicyValue value_; @@ -82,15 +82,15 @@ public: TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs); - virtual PortableServer::LifespanPolicyValue value (CORBA::Environment &env); + virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::LifespanPolicyValue value_; @@ -106,15 +106,15 @@ public: TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs); - virtual PortableServer::IdUniquenessPolicyValue value (CORBA::Environment &env); + virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::IdUniquenessPolicyValue value_; @@ -130,15 +130,15 @@ public: TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs); - virtual PortableServer::IdAssignmentPolicyValue value (CORBA::Environment &env); + virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::IdAssignmentPolicyValue value_; @@ -154,15 +154,15 @@ public: TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs); - virtual PortableServer::ImplicitActivationPolicyValue value (CORBA::Environment &env); + virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::ImplicitActivationPolicyValue value_; @@ -178,15 +178,15 @@ public: TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs); - virtual PortableServer::ServantRetentionPolicyValue value (CORBA::Environment &env); + virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::ServantRetentionPolicyValue value_; @@ -202,15 +202,15 @@ public: TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs); - virtual PortableServer::RequestProcessingPolicyValue value (CORBA::Environment &env); + virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::RequestProcessingPolicyValue value_; @@ -232,15 +232,15 @@ public: TAO_Synchronization_Policy (const TAO_Synchronization_Policy &rhs); - virtual PortableServer::SynchronizationPolicyValue value (CORBA::Environment &env); + virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::Policy_ptr copy (CORBA::Environment &env); + virtual CORBA::Policy_ptr copy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void destroy (CORBA::Environment &env); + virtual void destroy (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::PolicyType policy_type (CORBA::Environment &environment); + virtual CORBA::PolicyType policy_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: PortableServer::SynchronizationPolicyValue value_; @@ -285,12 +285,12 @@ public: virtual void synchronization (PortableServer::SynchronizationPolicyValue value); virtual void parse_policies (const CORBA::PolicyList &policies, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: virtual void parse_policy (const CORBA::Policy_ptr policy, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual int validity_check (void); @@ -381,36 +381,36 @@ public: virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // ************************************************** // @@ -419,66 +419,66 @@ public: // ************************************************** virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (PortableServer::SynchronizationPolicyValue value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual CORBA::String the_name (CORBA::Environment &env); + virtual CORBA::String the_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POA_ptr the_parent (CORBA::Environment &env); + virtual PortableServer::POA_ptr the_parent (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::POAManager_ptr the_POAManager (CORBA::Environment &env); + virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::AdapterActivator_ptr the_activator (CORBA::Environment &env); + virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void the_activator (PortableServer::AdapterActivator_ptr adapter_activator, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::ServantManager_ptr get_servant_manager (CORBA::Environment &env); + virtual PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::Servant get_servant (CORBA::Environment &env); + virtual PortableServer::Servant get_servant (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void set_servant (PortableServer::Servant servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void deactivate_object (const PortableServer::ObjectId &oid, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Object_ptr create_reference (const char *intf, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void forward_object (const PortableServer::ObjectId &oid, CORBA::Object_ptr forward_to, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Utility functions for the other static void encode_sequence_to_string (CORBA::String &str, @@ -501,40 +501,40 @@ public: TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, TAO_POA *parent, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); TAO_POA (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, TAO_POA *parent, TAO_Object_Table &active_object_map, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *clone (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, TAO_POA *parent, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *clone (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, TAO_POA *parent, TAO_Object_Table &active_object_map, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual ~TAO_POA (void); virtual void dispatch_servant (const TAO_ObjectKey &key, CORBA::ServerRequest &req, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual int locate_servant (const TAO_ObjectKey &key, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::Servant find_servant (const TAO_ObjectKey &key, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); static char name_separator (void); @@ -549,64 +549,64 @@ protected: virtual TAO_POA *create_POA (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *create_POA_i (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *find_POA (const String &adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *find_POA_i (const String &adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *find_POA_i_optimized (const String &adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::ServantManager_ptr get_servant_manager_i (CORBA::Environment &env); + virtual PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void set_servant_manager_i (PortableServer::ServantManager_ptr imgr, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::Servant get_servant_i (CORBA::Environment &env); + virtual PortableServer::Servant get_servant_i (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void set_servant_i (PortableServer::Servant servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void deactivate_object_i (const PortableServer::ObjectId &oid, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Object_ptr create_reference_i (const char *intf, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void forward_object_i (const PortableServer::ObjectId &oid, CORBA::Object_ptr forward_to, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual ACE_Lock &lock (void); @@ -615,22 +615,22 @@ protected: virtual TAO_Object_Table &active_object_map (void); virtual void delete_child (const String &child, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void delete_child_i (const String &child, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual String complete_name (void); virtual void set_complete_name (void); virtual int leaf_poa_name (const String &adapter_name, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void parse_poa_name (const TAO_POA::String &adapter_name, TAO_POA::String &topmost_poa_name, TAO_POA::String &tail_poa_name, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::ObjectId *create_object_id (void); @@ -663,33 +663,33 @@ public: protected: virtual LOCATION_RESULT locate_servant_i (const TAO_ObjectKey &key, PortableServer::Servant &servant, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual PortableServer::Servant locate_poa_and_servant_i (const TAO_ObjectKey &key, const char *operation, PortableServer::ObjectId &id, TAO_POA *&poa_impl, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *locate_poa_i (const TAO_ObjectKey &key, PortableServer::ObjectId &id, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void dispatch_servant_i (const TAO_ObjectKey &key, CORBA::ServerRequest &req, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void pre_invoke (const TAO_ObjectKey &key, const PortableServer::ObjectId &id, PortableServer::Servant servant, TAO_POA_Current *poa_current, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void post_invoke (PortableServer::Servant servant, const char *operation, TAO_POA_Current *poa_current, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA::Boolean persistent (void); @@ -756,17 +756,17 @@ public: UNKNOWN }; - virtual void activate (CORBA::Environment &env); + virtual void activate (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void hold_requests (CORBA::Boolean wait_for_completion, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void discard_requests (CORBA::Boolean wait_for_completion, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); TAO_POA_Manager (void); @@ -774,23 +774,23 @@ public: virtual ~TAO_POA_Manager (void); - virtual Processing_State state (CORBA::Environment &env); + virtual Processing_State state (CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: virtual ACE_Lock &lock (void); virtual void remove_poa (TAO_POA *poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void remove_poa_i (TAO_POA *poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void register_poa (TAO_POA *poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void register_poa_i (TAO_POA *poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); Processing_State state_; @@ -809,7 +809,7 @@ public: virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); }; class TAO_Export TAO_POA_Current : public POA_PortableServer::Current @@ -836,11 +836,11 @@ class TAO_Export TAO_POA_Current : public POA_PortableServer::Current public: // = Specification-mandated methods - virtual PortableServer::POA_ptr get_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr get_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Return pointer to the invoking POA. Raises the // <CORBA::NoContext> exception. - virtual PortableServer::ObjectId *get_object_id (CORBA::Environment &env); + virtual PortableServer::ObjectId *get_object_id (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Return pointer to the object id through which this was invoked. // This may be necessary in cases where a <Servant> is serving under // the guise of multiple object ids. This has _out semantics Raises diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 89e5be3d0ba..0fd14aea708 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -294,11 +294,11 @@ public: public: // the static operations static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj); - static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static ThreadPolicy_ptr _nil (void); - virtual ThreadPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual ThreadPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: ThreadPolicy (STUB_Object *objref = 0, TAO_ServantBase *servant = 0, @@ -391,11 +391,11 @@ public: public: // the static operations static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj); - static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static LifespanPolicy_ptr _nil (void); - virtual LifespanPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual LifespanPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: LifespanPolicy ( STUB_Object *objref = 0, @@ -490,11 +490,11 @@ public: public: // the static operations static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj); - static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static IdUniquenessPolicy_ptr _nil (void); - virtual IdUniquenessPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual IdUniquenessPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: IdUniquenessPolicy ( STUB_Object *objref = 0, @@ -589,11 +589,11 @@ public: public: // the static operations static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj); - static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static IdAssignmentPolicy_ptr _nil (void); - virtual IdAssignmentPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual IdAssignmentPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: IdAssignmentPolicy ( STUB_Object *objref = 0, @@ -688,11 +688,11 @@ public: public: // the static operations static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj); - static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static ImplicitActivationPolicy_ptr _nil (void); - virtual ImplicitActivationPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual ImplicitActivationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: ImplicitActivationPolicy ( STUB_Object *objref = 0, @@ -787,11 +787,11 @@ public: public: // the static operations static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj); - static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static ServantRetentionPolicy_ptr _nil (void); - virtual ServantRetentionPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual ServantRetentionPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: ServantRetentionPolicy ( STUB_Object *objref = 0, @@ -887,11 +887,11 @@ public: public: // the static operations static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj); - static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static RequestProcessingPolicy_ptr _nil (void); - virtual RequestProcessingPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual RequestProcessingPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: RequestProcessingPolicy ( STUB_Object *objref = 0, @@ -993,11 +993,11 @@ public: public: // the static operations static SynchronizationPolicy_ptr _duplicate (SynchronizationPolicy_ptr obj); - static SynchronizationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static SynchronizationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static SynchronizationPolicy_ptr _nil (void); - virtual SynchronizationPolicyValue value (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual SynchronizationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: SynchronizationPolicy ( STUB_Object *objref = 0, @@ -1084,7 +1084,7 @@ public: public: // the static operations static POAManager_ptr _duplicate (POAManager_ptr obj); - static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static POAManager_ptr _nil (void); @@ -1120,11 +1120,11 @@ public: #endif /* end #if !defined */ - virtual void activate (CORBA::Environment &env) = 0; - virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; - virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; - virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual void activate (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: POAManager ( STUB_Object *objref = 0, @@ -1211,11 +1211,11 @@ public: public: // the static operations static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj); - static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static AdapterActivator_ptr _nil (void); - virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA::Environment &env) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: AdapterActivator ( STUB_Object *objref = 0, @@ -1303,10 +1303,10 @@ public: public: // the static operations static ServantManager_ptr _duplicate (ServantManager_ptr obj); - static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static ServantManager_ptr _nil (void); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: ServantManager ( STUB_Object *objref = 0, @@ -1393,12 +1393,12 @@ public: public: // the static operations static ServantActivator_ptr _duplicate (ServantActivator_ptr obj); - static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static ServantActivator_ptr _nil (void); - virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA::Environment &env) = 0; - virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: ServantActivator ( STUB_Object *objref = 0, @@ -1488,12 +1488,12 @@ public: // the static operations static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); - static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static ServantLocator_ptr _nil (void); - virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA::Environment &env) = 0; - virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA::Environment &env) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: ServantLocator ( STUB_Object *objref = 0, @@ -1580,7 +1580,7 @@ public: public: // the static operations static POA_ptr _duplicate (POA_ptr obj); - static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static POA_ptr _nil (void); @@ -1942,16 +1942,16 @@ public: #endif /* end #if !defined */ - virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA::Environment &env) = 0; - virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env) = 0; - virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; - virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA::Environment &env) = 0; - virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA::Environment &env) = 0; - virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA::Environment &env) = 0; - virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA::Environment &env) = 0; - virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA::Environment &env) = 0; - virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA::Environment &env) = 0; - virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA::Environment &env) = 0; + virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // ************************************************** // @@ -1959,29 +1959,29 @@ public: // // ************************************************** - virtual SynchronizationPolicy_ptr create_synchronization_policy (SynchronizationPolicyValue value, CORBA::Environment &env) = 0; - - virtual char * the_name (CORBA::Environment &env) = 0; - virtual POA_ptr the_parent (CORBA::Environment &env) = 0; - virtual POAManager_ptr the_POAManager (CORBA::Environment &env) = 0; - virtual AdapterActivator_ptr the_activator (CORBA::Environment &env) = 0; - virtual void the_activator(AdapterActivator_ptr the_activator, CORBA::Environment &env) = 0; - virtual ServantManager_ptr get_servant_manager (CORBA::Environment &env) = 0; - virtual void set_servant_manager (ServantManager_ptr imgr, CORBA::Environment &env) = 0; - virtual Servant get_servant (CORBA::Environment &env) = 0; - virtual void set_servant (Servant p_servant, CORBA::Environment &env) = 0; - virtual ObjectId * activate_object (Servant p_servant, CORBA::Environment &env) = 0; - virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA::Environment &env) = 0; - virtual void deactivate_object (const ObjectId &oid, CORBA::Environment &env) = 0; - virtual CORBA::Object_ptr create_reference (const char *intf, CORBA::Environment &env) = 0; - virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA::Environment &env) = 0; - virtual ObjectId * servant_to_id (Servant p_servant, CORBA::Environment &env) = 0; - virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA::Environment &env) = 0; - virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env) = 0; - virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env) = 0; - virtual Servant id_to_servant (const ObjectId &oid, CORBA::Environment &env) = 0; - virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA::Environment &env) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual SynchronizationPolicy_ptr create_synchronization_policy (SynchronizationPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + + virtual char * the_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual POA_ptr the_parent (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual POAManager_ptr the_POAManager (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual AdapterActivator_ptr the_activator (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ServantManager_ptr get_servant_manager (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual Servant get_servant (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void set_servant (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual void deactivate_object (const ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual Servant id_to_servant (const ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: POA ( STUB_Object *objref = 0, @@ -2068,7 +2068,7 @@ public: public: // the static operations static Current_ptr _duplicate (Current_ptr obj); - static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static Current_ptr _nil (void); @@ -2104,9 +2104,9 @@ public: #endif /* end #if !defined */ - virtual POA_ptr get_POA (CORBA::Environment &env); - virtual ObjectId * get_object_id (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + virtual POA_ptr get_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual ObjectId * get_object_id (CORBA_Environment &_env = CORBA_Environment::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: Current ( STUB_Object *objref = 0, diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h index f8c2d53ed83..71c21bc19fc 100644 --- a/TAO/tao/POAS.h +++ b/TAO/tao/POAS.h @@ -35,29 +35,29 @@ public: virtual ~ThreadPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ThreadPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::ThreadPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::ThreadPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -76,19 +76,19 @@ public: ThreadPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ThreadPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: ThreadPolicy_ptr servant_; @@ -108,30 +108,30 @@ public: virtual ~LifespanPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::LifespanPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::LifespanPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::LifespanPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -150,19 +150,19 @@ public: LifespanPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::LifespanPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -183,30 +183,30 @@ public: virtual ~IdUniquenessPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::IdUniquenessPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::IdUniquenessPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -225,19 +225,19 @@ public: IdUniquenessPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::IdUniquenessPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -258,30 +258,30 @@ public: virtual ~IdAssignmentPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::IdAssignmentPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::IdAssignmentPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -300,19 +300,19 @@ public: IdAssignmentPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::IdAssignmentPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -333,30 +333,30 @@ public: virtual ~ImplicitActivationPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ImplicitActivationPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::ImplicitActivationPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -375,19 +375,19 @@ public: ImplicitActivationPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ImplicitActivationPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -408,30 +408,30 @@ public: virtual ~ServantRetentionPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::ServantRetentionPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::ServantRetentionPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -450,19 +450,19 @@ public: ServantRetentionPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ServantRetentionPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -483,30 +483,30 @@ public: virtual ~RequestProcessingPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::RequestProcessingPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::RequestProcessingPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -525,19 +525,19 @@ public: RequestProcessingPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::RequestProcessingPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -564,30 +564,30 @@ public: virtual ~SynchronizationPolicy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::SynchronizationPolicyValue value (CORBA::Environment &env) = 0; - static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; + static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - PortableServer::SynchronizationPolicy *_this (CORBA::Environment &_tao_environment); + PortableServer::SynchronizationPolicy *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -606,19 +606,19 @@ public: SynchronizationPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::SynchronizationPolicyValue value ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -639,23 +639,23 @@ public: virtual ~POAManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual void activate ( CORBA::Environment &env) = 0; // pure virtual + virtual void activate ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; // pure virtual + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; // pure virtual + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; // pure virtual + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::POAManager *_this (CORBA::Environment &_tao_environment); + PortableServer::POAManager *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -673,23 +673,23 @@ public: POAManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void activate ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void hold_requests ( CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void discard_requests ( CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void deactivate ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -710,17 +710,17 @@ public: virtual ~AdapterActivator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA::Environment &env) = 0; // pure virtual + virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::AdapterActivator *_this (CORBA::Environment &_tao_environment); + PortableServer::AdapterActivator *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -738,12 +738,12 @@ public: AdapterActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char* name, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -764,15 +764,15 @@ public: virtual ~ServantManager (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::ServantManager *_this (CORBA::Environment &_tao_environment); + PortableServer::ServantManager *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -790,7 +790,7 @@ public: ServantManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -811,19 +811,19 @@ public: virtual ~ServantActivator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env) = 0; // pure virtual + virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::ServantActivator *_this (CORBA::Environment &_tao_environment); + PortableServer::ServantActivator *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -842,12 +842,12 @@ public: ServantActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void etherealize ( const PortableServer::ObjectId & oid, @@ -855,7 +855,7 @@ public: PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -876,7 +876,7 @@ public: virtual ~ServantLocator (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); @@ -884,15 +884,15 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA::Environment &env) = 0; // pure virtual + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA::Environment &env) = 0; // pure virtual + virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::ServantLocator *_this (CORBA::Environment &_tao_environment); + PortableServer::ServantLocator *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -911,14 +911,14 @@ public: ServantLocator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::Servant preinvoke ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void postinvoke ( const PortableServer::ObjectId & oid, @@ -926,7 +926,7 @@ public: const char * operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -947,29 +947,29 @@ public: virtual ~POA (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; // pure virtual + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual // ************************************************** // @@ -977,53 +977,53 @@ public: // // ************************************************** - virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (PortableServer::SynchronizationPolicyValue value, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (PortableServer::SynchronizationPolicyValue value, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual char * the_name (CORBA::Environment &env) = 0; + virtual char * the_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; - virtual PortableServer::POA_ptr the_parent (CORBA::Environment &env) = 0; + virtual PortableServer::POA_ptr the_parent (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; - virtual PortableServer::POAManager_ptr the_POAManager (CORBA::Environment &env) = 0; + virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; - virtual PortableServer::AdapterActivator_ptr the_activator (CORBA::Environment &env) = 0; + virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; - virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA::Environment &env) = 0; + virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; - virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA::Environment &env) = 0; // pure virtual + virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant get_servant ( CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::Servant get_servant ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void set_servant (PortableServer::Servant p_servant, CORBA::Environment &env) = 0; // pure virtual + virtual void set_servant (PortableServer::Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Environment &env) = 0; // pure virtual + virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual void deactivate_object (const PortableServer::ObjectId &oid, CORBA::Environment &env) = 0; // pure virtual + virtual void deactivate_object (const PortableServer::ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr create_reference (const char *intf, CORBA::Environment &env) = 0; // pure virtual + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA::Environment &env) = 0; // pure virtual + virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ObjectId * servant_to_id (PortableServer::Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, CORBA::Environment &env) = 0; // pure virtual + virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, CORBA::Environment &env) = 0; // pure virtual + virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA::Environment &env) = 0; // pure virtual + virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::POA *_this (CORBA::Environment &_tao_environment); + PortableServer::POA *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -1041,51 +1041,51 @@ public: POA_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::POA_ptr create_POA ( const char* adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList & policies, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::POA_ptr find_POA ( const char* adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); // ************************************************** @@ -1096,83 +1096,83 @@ public: virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy ( PortableServer::SynchronizationPolicyValue value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual char* the_name ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::POA_ptr the_parent ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::POAManager_ptr the_POAManager ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::AdapterActivator_ptr the_activator ( - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void the_activator (PortableServer::AdapterActivator_ptr _tao_value, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ServantManager_ptr get_servant_manager ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::Servant get_servant ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void set_servant ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ObjectId * activate_object ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void activate_object_with_id ( const PortableServer::ObjectId & id, PortableServer::Servant p_servant, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void deactivate_object ( const PortableServer::ObjectId & oid, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Object_ptr create_reference ( const char *intf, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId & oid, const char *intf, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ObjectId * servant_to_id ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::Servant reference_to_servant ( CORBA::Object_ptr reference, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ObjectId * reference_to_id ( CORBA::Object_ptr reference, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::Servant id_to_servant ( const PortableServer::ObjectId & oid, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId & oid, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -1193,21 +1193,21 @@ public: virtual ~Current (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - virtual PortableServer::POA_ptr get_POA ( CORBA::Environment &env) = 0; // pure virtual - static void get_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::POA_ptr get_POA ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual + static void get_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual PortableServer::ObjectId * get_object_id ( CORBA::Environment &env) = 0; // pure virtual - static void get_object_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // pure virtual + static void get_object_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - PortableServer::Current *_this (CORBA::Environment &_tao_environment); + PortableServer::Current *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -1226,13 +1226,13 @@ public: Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::POA_ptr get_POA ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual PortableServer::ObjectId * get_object_id ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index ec784738b5a..b81d720b3a0 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -44,45 +44,45 @@ public: virtual ~Policy (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ) = 0; static void _get_policy_type_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ) = 0; static void copy_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ) = 0; static void destroy_skel ( CORBA::ServerRequest &_tao_req, void *_tao_obj, void *_tao_context, - CORBA::Environment &_tao_env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA::Environment &_tao_env); + virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - ACE_CORBA_1(Policy) *_this (CORBA::Environment &_tao_environment); + ACE_CORBA_1(Policy) *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -100,16 +100,16 @@ public: Policy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: @@ -135,15 +135,15 @@ public: virtual ~Current (void); virtual CORBA::Boolean _is_a ( const char* logical_type_id, - CORBA::Environment &_tao_environment); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual void* _downcast ( const char* logical_type_id ); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA::Environment &_tao_env); + virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &_env = CORBA_Environment::default_environment ()); - ACE_CORBA_1(Current) *_this (CORBA::Environment &_tao_environment); + ACE_CORBA_1(Current) *_this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual const char* _interface_repository_id (void) const; }; @@ -161,7 +161,7 @@ public: Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( const char *logical_type_id, - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); private: diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 071ed15e07f..4ef1799ac0d 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -85,20 +85,20 @@ class TAO_Export CORBA_Policy : public virtual ACE_CORBA_1 (Object) public: // the static operations static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj); - static CORBA_Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static CORBA_Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &_env = CORBA_Environment::default_environment ()); static CORBA_Policy_ptr _nil (void); virtual CORBA::PolicyType policy_type ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA_Policy_ptr copy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual void destroy ( - CORBA::Environment &_tao_environment + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, - CORBA::Environment &env + CORBA_Environment &_env = CORBA_Environment::default_environment () ); virtual const char* _interface_repository_id (void) const; protected: diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index 2b7f0e4e2e5..d7265f5b68f 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -44,7 +44,7 @@ public: CORBA::ExceptionList_ptr exceptions (void); // Return the exceptions resulting from this request. - CORBA::Environment *env (void); + CORBA_Environment *env (void); // Return the <Environment> for this request. void invoke (void); @@ -96,7 +96,7 @@ private: CORBA::Flags flags_; // invocation flags - CORBA::Environment env_; + CORBA_Environment env_; // holds exceptions CORBA::ExceptionList exceptions_; diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index a765cdd4660..7290c57c073 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -60,7 +60,7 @@ public: virtual void _downcast (void* target, CORBA_Object* src, - CORBA_Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Used for sequences of objects to downcast a recently demarshalled // object reference into the right type. diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h index d1863ca1e13..b8865d0404c 100644 --- a/TAO/tao/Sequence_T.h +++ b/TAO/tao/Sequence_T.h @@ -414,7 +414,7 @@ public: CORBA::ULong old_length); virtual void _downcast (void* target, CORBA_Object* src, - CORBA_Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA_Object* _upcast (void* src) const; }; @@ -470,7 +470,7 @@ public: CORBA::ULong old_length); virtual void _downcast (void* target, CORBA_Object* src, - CORBA_Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual CORBA_Object* _upcast (void* src) const; }; diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h index f37484dd137..c47c92113c8 100644 --- a/TAO/tao/Servant_Base.h +++ b/TAO/tao/Servant_Base.h @@ -35,13 +35,13 @@ public: TAO_ServantBase &operator= (const TAO_ServantBase &); // assignment operator. - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Returns the default POA for this servant. virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable. - virtual STUB_Object *_create_stub (CORBA_Environment &env); + virtual STUB_Object *_create_stub (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // This is an auxiliar method for _this() and _narrow(). protected: @@ -52,12 +52,12 @@ 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 &_env = CORBA_Environment::default_environment ()); // Local implementation of the CORBA::Object::_is_a method. virtual void _dispatch (CORBA::ServerRequest &request, void *context, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Dispatches a request to the object: find the operation, cast the // type to the most derived type, demarshall all the parameters from // the request and finally invokes the operation, storing the @@ -86,7 +86,7 @@ class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase // = TITLE // Base class for local skeletons and servants. protected: - STUB_Object *_create_stub (CORBA_Environment &env); + STUB_Object *_create_stub (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // This is an auxiliar method for _this(). Make sure *not* to // register with the default POA }; @@ -103,19 +103,19 @@ class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase // circumstances may lead to unpredictable results. public: virtual void invoke (CORBA::ServerRequest_ptr request, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // The invoke() method receives requests issued to any CORBA object // incarnated by the DSI servant and performs the processing // necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // The _primary_interface() method receives an ObjectId value and a // POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - CORBA::Object_ptr _this (CORBA::Environment &env); + CORBA::Object_ptr _this (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Returns a CORBA::Object_ptr for the target object. protected: @@ -126,12 +126,12 @@ protected: virtual void *_downcast (const char *repository_id); // Simply returns "this" - virtual STUB_Object *_create_stub (CORBA_Environment &env); + virtual STUB_Object *_create_stub (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // This is an auxiliar method for _this() and _narrow(). virtual void _dispatch (CORBA::ServerRequest &request, void *context, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Turns around and calls invoke. }; diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h index c44166b5d4a..ac67f4e4ffa 100644 --- a/TAO/tao/Server_Request.h +++ b/TAO/tao/Server_Request.h @@ -105,13 +105,13 @@ public: // the standard _nil method on pseudo objects virtual void arguments (CORBA::NVList_ptr &list, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Implementation uses this to provide the ORB with the operation's // parameter list ... on return, their values are available; the // list fed in has typecodes and (perhap) memory assigned. virtual void set_result (const CORBA::Any &value, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Implementation uses this to provide the operation result // ... illegal if exception() was called or params() was not called. // @@ -119,7 +119,7 @@ public: // sent when this returns, and reclaim memory it allocated. virtual void set_exception (const CORBA::Any &value, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Implementation uses this to provide the exception value which is // the only result of this particular invocation. // @@ -149,21 +149,21 @@ public: virtual CORBA::ORB_ptr orb (void) = 0; // get the underlying ORB - virtual void demarshal (CORBA::Environment &orb_env, + virtual void demarshal (CORBA_Environment &orb_env, const TAO_Call_Data_Skel *info, ...) = 0; // demarshal incoming parameters - virtual void marshal (CORBA::Environment &orb_env, - CORBA::Environment &skel_env, + virtual void marshal (CORBA_Environment &orb_env, + CORBA_Environment &skel_env, const TAO_Call_Data_Skel *info, ...) = 0; // marshal outgoing parameters - virtual void dsi_marshal (CORBA::Environment &env) = 0; + virtual void dsi_marshal (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // marshal outgoing parameters. Used by DSI - virtual void init_reply (CORBA::Environment &env) = 0; + virtual void init_reply (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Start a Reply message. virtual TAO_InputCDR &incoming (void) = 0; @@ -186,7 +186,7 @@ public: TAO_OutputCDR &output, CORBA::ORB_ptr the_orb, TAO_POA *the_poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Constructor IIOP_ServerRequest (CORBA::ULong &request_id, CORBA::Boolean &response_expected, @@ -195,20 +195,20 @@ public: TAO_OutputCDR &output, CORBA::ORB_ptr the_orb, TAO_POA *the_poa, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual ~IIOP_ServerRequest (void); // Destructor. // = General ServerRequest operations void arguments (CORBA::NVList_ptr &list, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); void set_result (const CORBA::Any &value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); void set_exception (const CORBA::Any &value, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); // = Request attributes. @@ -231,24 +231,24 @@ public: // meant to be used internally. // - virtual void demarshal (CORBA::Environment &orb_env, + virtual void demarshal (CORBA_Environment &orb_env, const TAO_Call_Data_Skel *info, ...); // demarshal incoming parameters. Used by the SSI skeleton (i.e., the IDL // compiler generated skeleton) - virtual void marshal (CORBA::Environment &orb_env, - CORBA::Environment &skel_env, + virtual void marshal (CORBA_Environment &orb_env, + CORBA_Environment &skel_env, const TAO_Call_Data_Skel *info, ...); // marshal outgoing parameters and return value. This is used by the SSI // i.e., by the IDL compiler generated skeletons. - virtual void dsi_marshal (CORBA::Environment &env); + virtual void dsi_marshal (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // does the marshaling of outgoing parameters and is used by the DSI based // scheme - virtual void init_reply (CORBA::Environment &env); + virtual void init_reply (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // start a Reply message virtual TAO_InputCDR &incoming (void); diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 25c189ab176..03fc53fadb4 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -197,7 +197,7 @@ class TAO_Export STUB_Object // The stub and DII interpreter APIs are member functions of this // type. public: - virtual void do_static_call (CORBA::Environment &env, + virtual void do_static_call (CORBA_Environment &env, const TAO_Call_Data *info, void** args) = 0; // The "stub interpreter" method parameters are: @@ -223,7 +223,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Flags flags, CORBA::ExceptionList &exceptions, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Dynamic invocations use a more costly "varargs" calling // convention; it's got the same input data as the (static) // stub-oriented one, but the data is represented somewhat @@ -246,7 +246,7 @@ public: // All objref representations carry around a type ID. virtual CORBA::ULong hash (CORBA::ULong maximum, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // All objref representations know how to hash themselves and // compare themselves for equivalence to others. It's easily // possible to have two objrefs that are distinct copies of data @@ -254,7 +254,7 @@ public: // equivalent). virtual CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj, - CORBA::Environment &env) = 0; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // check for equivalence STUB_Object (CORBA::String p = 0); @@ -269,7 +269,7 @@ public: // only supports one protocol -- the problem won't show up. // "Multiprotocol ORBs" will need to solve that problem though. ] - virtual TAO_ObjectKey *key (CORBA::Environment &env) = 0; + virtual TAO_ObjectKey *key (CORBA_Environment &_env = CORBA_Environment::default_environment ()) = 0; // Return the object key as an out parameter. Caller should release // return value when finished with it. diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h index 211e0188ff0..744446bba06 100644 --- a/TAO/tao/TAO.h +++ b/TAO/tao/TAO.h @@ -39,27 +39,27 @@ public: int init (int& argc, char *argv[], - CORBA_Environment &env); + 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 &_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 &_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 &_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 diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index 4751d9df2ca..3f99a3ac12e 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -84,52 +84,52 @@ public: // Returns a NULL typecode. CORBA::Boolean equal (const CORBA::TypeCode_ptr, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Compares two typecodes. - CORBA::TCKind kind (CORBA::Environment &) const; + CORBA::TCKind kind (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // For all TypeCode kinds, returns the "kind" of the typecode. - const char *id (CORBA::Environment &) const; + const char *id (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // For tk_{objref,struct,union,enum,alias,except}. Returns the // repository ID, raises BadKind. - const char *name (CORBA::Environment &) const; + const char *name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns name (), raises (BadKind). - CORBA::ULong member_count (CORBA::Environment &) const; + CORBA::ULong member_count (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns member_count (), raises (BadKind). Useful for tk_struct, // tk_union, tk_enum, tk_alias, and tk_except. const char *member_name (CORBA::ULong index, - CORBA::Environment &) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns member_name (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, tk_enum, tk_alias, and tk_except. CORBA::TypeCode_ptr member_type (CORBA::ULong index, - CORBA::Environment &) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns member_type (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, and tk_except. CORBA::Any_ptr member_label (CORBA::ULong n, - CORBA::Environment&) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // For tk_union. Returns the label. Raises BadKind, Bounds. - CORBA::TypeCode_ptr discriminator_type (CORBA::Environment &) const; + CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns the discriminator type for tk_union. raises (BadKind). - CORBA::Long default_index (CORBA::Environment &) const; + CORBA::Long default_index (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns the default index for the tk_union. Raises (BadKind). - CORBA::ULong length (CORBA::Environment &) const; + CORBA::ULong length (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns length, raises (BadKind). Used for tk_string, // tk_sequence, and tk_array. - CORBA::TypeCode_ptr content_type (CORBA::Environment &) const; + CORBA::TypeCode_ptr content_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Returns the content type (element type). Raises (BadKind); Useful // for tk_sequence, tk_array, and tk_alias. - CORBA::ULong TAO_discrim_pad_size (CORBA::Environment &); + CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculates the padded size of discriminant type TAO Extension. // = Creation/refcounting @@ -171,10 +171,10 @@ public: }; // these are used to indicate the status of marshaling - size_t size (CORBA::Environment &env); + size_t size (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // returns the size. Used by the IIOP marshaling engine. - size_t alignment (CORBA::Environment &env); + size_t alignment (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // returns the alignment requirements for this typecode. used by the // IIOP marshaling engine. @@ -184,15 +184,15 @@ public: // = Following three are deprecated - CORBA::ULong param_count (CORBA::Environment &) const; + CORBA::ULong param_count (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Deprecated, CORBA 1.2, not fully usable. Returns the number of // parameters that the typecode takes. CORBA::ULong ulong_param (CORBA::ULong n, - CORBA::Environment &) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; CORBA::TypeCode_ptr typecode_param (CORBA::ULong n, - CORBA::Environment &) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Internal utilities, pending CORBA 2.0 IFR APIs; just enough to // make array and sequence typecode interpretation cheap @@ -228,98 +228,98 @@ private: // = All the private/helper methods CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // Compares the typecodes. - const char *private_id (CORBA::Environment &) const; + const char *private_id (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // For tk_{objref,struct,union,enum,alias,except}. Returns the // repository ID, raises BadKind. - const char *private_name (CORBA::Environment &) const; + const char *private_name (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns name (), raises (BadKind) - CORBA::ULong private_member_count (CORBA::Environment &) const; + CORBA::ULong private_member_count (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns member_count (), raises (BadKind). Useful for tk_struct, // tk_union, tk_enum, tk_alias, and tk_except. CORBA::TypeCode_ptr private_member_type (CORBA::ULong index, - CORBA::Environment &) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns member_type (...), raises (BadKind, Bounds); Useful for // tk_struct, tk_union, and tk_except const char *private_member_name (CORBA::ULong index, - CORBA::Environment &) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union, // tk_struct, tk_except, and tk_enum CORBA::Any_ptr private_member_label (CORBA::ULong n, - CORBA::Environment&) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // For tk_union. Returns the label. Raises BadKind, Bounds. - CORBA::TypeCode_ptr private_discriminator_type (CORBA::Environment &) const; + CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns the discriminator type for tk_union. raises (BadKind); - CORBA::Long private_default_index (CORBA::Environment &) const; + CORBA::Long private_default_index (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns the default index for the tk_union. Raises (BadKind); - CORBA::Long private_length (CORBA::Environment &) const; + CORBA::Long private_length (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns length, raises (BadKind). Used for tk_string, // tk_sequence, and tk_array - CORBA::TypeCode_ptr private_content_type (CORBA::Environment &) const; + CORBA::TypeCode_ptr private_content_type (CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // returns the content type (element type). Raises (BadKind); Useful // for tk_sequence, tk_array, and tk_alias - size_t private_size (CORBA::Environment &env); + size_t private_size (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // returns the size. Used by the IIOP marshaling engine. - size_t private_alignment (CORBA::Environment &env); + size_t private_alignment (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // returns the alignment requirements for this typecode. used by the // IIOP marshaling engine. - CORBA::ULong private_discrim_pad_size (CORBA::Environment &); + CORBA::ULong private_discrim_pad_size (CORBA_Environment &_env = CORBA_Environment::default_environment ()); // Calculates the padded size of discriminant type TAO Extension // = All the private helpers testing for equality of typecodes CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of objrefs CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of structs CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of unions CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of enums CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of strings CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of wide strings CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of sequences CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of array CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of typedefs CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) const; + CORBA_Environment &_env = CORBA_Environment::default_environment ()) const; // test equality for typecodes of exceptions CORBA::ULong refcount_; diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index a3bf166c6da..18cc988d950 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -139,11 +139,12 @@ class TAO_OuputCDR; // enum values defined in nvlist.hh, bitwise ORed. typedef u_int CORBA_Flags; -typedef void (*TAO_Skeleton)(CORBA_ServerRequest &, - // CORBA_Object_ptr, - void *, - void *, - CORBA_Environment &); +typedef void (*TAO_Skeleton)( + CORBA_ServerRequest &, + void *, + void *, + CORBA_Environment &_env + ); // NOTE: stub APIs are nonportable, and must be explicitly #included // by code emitted from an IDL compiler. @@ -155,6 +156,10 @@ typedef void (*TAO_Skeleton)(CORBA_ServerRequest &, // Alignment macros #include "tao/Align.h" +// This class is used even in the ORB definition. Its header file only +// uses the forward declarations. +#include "tao/Environment.h" + // CORBA class. #include "tao/ORB.h" @@ -236,7 +241,7 @@ extern TAO_Export int operator== (const TAO_ObjectKey &l, // The first "do" scope is for the env. // The second "do" scope is for the TAO_CHECK_ENV continues. #define TAO_TRY \ -CORBA::Environment TAO_TRY_ENV; \ +CORBA_Environment TAO_TRY_ENV; \ try { #define TAO_CATCH(TYPE,VAR) \ } catch (TYPE & VAR) { @@ -273,7 +278,7 @@ try { // I would like to experiment with this idea in the future.... #if 0 #define TAO_TRY_VAR(X) \ -do { CORBA::Environment &TAO_TRY_ENV = X; \ +do { CORBA_Environment &_env = CORBA_Environment::default_environment ()= X; \ int TAO_TRY_FLAG = 1; \ TAO_TRY_LABEL: \ if (TAO_TRY_FLAG) \ @@ -283,7 +288,7 @@ do { // The first "do" scope is for the env. // The second "do" scope is for the TAO_CHECK_ENV continues. #define TAO_TRY \ -do { CORBA::Environment TAO_TRY_ENV; \ +do { CORBA_Environment TAO_TRY_ENV; \ int TAO_TRY_FLAG = 1; \ TAO_TRY_LABEL: \ if (TAO_TRY_FLAG) \ diff --git a/TAO/tao/poa_T.h b/TAO/tao/poa_T.h index 8f9e29bdb6c..876f080c117 100644 --- a/TAO/tao/poa_T.h +++ b/TAO/tao/poa_T.h @@ -14,27 +14,27 @@ public: PortableServer::POAManager_ptr poa_manager, TAO_POA_Policies &policies, PortableServer::POA_ptr parent, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); TAO_Locked_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, TAO_POA_Policies &policies, PortableServer::POA_ptr parent, TAO_Object_Table &active_object_table, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *clone (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, TAO_POA_Policies &policies, PortableServer::POA_ptr parent, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); virtual TAO_POA *clone (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, TAO_POA_Policies &policies, PortableServer::POA_ptr parent, TAO_Object_Table &active_object_table, - CORBA::Environment &env); + CORBA_Environment &_env = CORBA_Environment::default_environment ()); protected: diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h index 038bdc2fddd..e322c8f2ccb 100644 --- a/TAO/tao/varout.h +++ b/TAO/tao/varout.h @@ -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 &_env = CORBA_Environment::default_environment ()); virtual CORBA_Object* _upcast (void); virtual void _release (void); // Implement the TAO_Object_Field methods. |