From 3b0bc5e788bccf7a7f83dca3be411f0b1d7269e0 Mon Sep 17 00:00:00 2001 From: irfan Date: Tue, 20 Jan 1998 00:01:05 +0000 Subject: *** empty log message *** --- TAO/tao/TAO.dsp | 10 +- TAO/tao/corbacom.h | 6 + TAO/tao/iiopobj.h | 2 +- TAO/tao/objtable.cpp | 2 + TAO/tao/poa.cpp | 123 +- TAO/tao/poa.h | 13 +- TAO/tao/poaC.cpp | 1138 ++++++-------- TAO/tao/poaC.h | 2955 ++++++++++++++++++------------------- TAO/tao/poaC.i | 445 +++--- TAO/tao/poaS.cpp | 1251 +++++++++++----- TAO/tao/poaS.h | 263 +++- TAO/tao/servant_base.cpp | 15 +- TAO/tao/servant_base.h | 2 +- TAO/tests/POA/NewPOA/NewPOA.cpp | 20 +- TAO/tests/POA/NewPOA/NewPOA.dsp | 2 +- TAO/tests/POA/RootPOA/RootPOA.cpp | 7 +- 16 files changed, 3319 insertions(+), 2935 deletions(-) diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index 7b23a6b0793..2ea42aaa9a6 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -208,19 +208,15 @@ SOURCE=.\poa.cpp # End Source File # Begin Source File -SOURCE=.\POAC.cpp -# End Source File -# Begin Source File - -SOURCE=.\POAS.cpp +SOURCE=.\principa.cpp # End Source File # Begin Source File -SOURCE=.\principa.cpp +SOURCE=.\request.cpp # End Source File # Begin Source File -SOURCE=.\request.cpp +SOURCE=.\sequence.cpp # End Source File # Begin Source File diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h index 9e41ff6fa49..2a00436af26 100644 --- a/TAO/tao/corbacom.h +++ b/TAO/tao/corbacom.h @@ -78,6 +78,9 @@ class CORBA_Object_var; class CORBA_Object_out; //typedef class CORBA_Object *CORBA_Object_ptr; +class CORBA_ORB_var; +class CORBA_ORB_out; + class CORBA_ServerRequest; //typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr; @@ -441,6 +444,9 @@ public: typedef CORBA_Object_var Object_var; typedef CORBA_Object_out Object_out; + typedef CORBA_ORB_var ORB_var; + typedef CORBA_ORB_out ORB_out; + typedef CORBA_Principal Principal; typedef CORBA_Principal *Principal_ptr; diff --git a/TAO/tao/iiopobj.h b/TAO/tao/iiopobj.h index 0e030f71a94..6b7b042801c 100644 --- a/TAO/tao/iiopobj.h +++ b/TAO/tao/iiopobj.h @@ -211,7 +211,7 @@ public: TAO_HRESULT QueryInterface (REFIID type_id, void **ppv); - virtual TAO::ObjectKey* key (CORBA::Environment &); + virtual TAO::ObjectKey *key (CORBA::Environment &env); // Return the object key as an out parameter. Caller should release // return value when finished with it. diff --git a/TAO/tao/objtable.cpp b/TAO/tao/objtable.cpp index 21dcc1ca20a..3e877469f8a 100644 --- a/TAO/tao/objtable.cpp +++ b/TAO/tao/objtable.cpp @@ -207,6 +207,7 @@ TAO_Object_Table::end (void) const +/* int operator== (const PortableServer::ObjectId &l, const PortableServer::ObjectId &r) @@ -223,6 +224,7 @@ operator== (const PortableServer::ObjectId &l, } return 1; } +*/ // Template specialization.... u_long diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp index 1feb98d9542..885f8527bc0 100644 --- a/TAO/tao/poa.cpp +++ b/TAO/tao/poa.cpp @@ -318,7 +318,7 @@ TAO_POA_Policies::parse_policies (const PortableServer::PolicyList& policies, i < policies.length () && env.exception () == 0; i++) { - this->parse_policy (policies[i].in (), env); + this->parse_policy (policies[i], env); } } @@ -1565,9 +1565,12 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference, // WrongAdapter exception is raised. PortableServer::ObjectId_var id; TAO_POA::String poa_name; + CORBA::Boolean persistent = CORBA::B_FALSE; - int result = this->parse_key (key.in (), poa_name, id.out ()); - if (result != 0 || poa_name != this->complete_name ()) + int result = this->parse_key (key.in (), poa_name, id.out (), persistent); + if (result != 0 || + poa_name != this->complete_name () || + persistent != this->persistent ()) { CORBA::Exception *exception = new PortableServer::POA::WrongAdapter; env.exception (exception); @@ -1618,9 +1621,12 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference, TAO::ObjectKey_var key = reference->key (env); PortableServer::ObjectId_var id; TAO_POA::String poa_name; + CORBA::Boolean persistent = CORBA::B_FALSE; - int result = this->parse_key (key.in (), poa_name, id.out ()); - if (result != 0 || poa_name != this->complete_name ()) + int result = this->parse_key (key.in (), poa_name, id.out (), persistent); + if (result != 0 || + poa_name != this->complete_name () || + persistent != this->persistent ()) { CORBA::Exception *exception = new PortableServer::POA::WrongAdapter; env.exception (exception); @@ -1745,17 +1751,18 @@ TAO_POA::locate_servant_i (const TAO::ObjectKey &key, { PortableServer::ObjectId_var id; TAO_POA::String poa_name; + CORBA::Boolean persistent = CORBA::B_FALSE; - int result = this->parse_key (key, poa_name, id.out ()); + int result = this->parse_key (key, poa_name, id.out (), persistent); if (result != 0) { CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO); env.exception (exception); return 0; - } + } TAO_POA *poa = this->find_POA_i (poa_name, - CORBA::B_FALSE, + persistent, env); if (env.exception () != 0) @@ -1772,34 +1779,86 @@ TAO_POA::locate_servant_i (const TAO::ObjectKey &key, int TAO_POA::parse_key (const TAO::ObjectKey &key, TAO_POA::String &poa_name, - PortableServer::ObjectId_out id) + PortableServer::ObjectId_out id, + CORBA::Boolean &persistent) { // Grab the id buffer TAO_POA::String object_key (TAO_POA::ObjectKey_to_const_string (key)); - // Try to find the name separator - int token_position = object_key.rfind (TAO_POA::name_separator ()); + // Try to find the first separator + int first_token_position = object_key.find (TAO_POA::name_separator ()); // If not found, the name is not correct - if (token_position == TAO_POA::String::npos) + if (first_token_position == TAO_POA::String::npos) { return -1; } - else + + // Try to find the second separator + int second_token_position = object_key.rfind (TAO_POA::name_separator ()); + + // If not found or the token are not distinct, the name is not correct + if (second_token_position == TAO_POA::String::npos || + first_token_position == second_token_position) { - // If found, take the substring from 0 to token_position for the - // poa_name and the substring from (token_position + - // separator_length) to length for the objectId - poa_name = object_key.substr (0, token_position); + return -1; + } + + // Take the substring from 0 to first_token_position for the + // object_key_type. + TAO_POA::String object_key_type = object_key.substr (0, first_token_position); + if (object_key_type == this->persistent_key_type ()) + persistent = 1; + else if (object_key_type == this->transient_key_type ()) + persistent = 0; + else + // Incorrect key + return -1; - TAO_POA::String objectId = object_key.substr (token_position + TAO_POA::name_separator_length (), - object_key.length ()); + // Take the substring from (first_token_position + separator_length) + // to second_token_position for the POA name + poa_name = object_key.substr (first_token_position + TAO_POA::name_separator_length (), + second_token_position); + + // Take the substring from (second_token_position + + // separator_length) to length for the objectId + + TAO_POA::String objectId = object_key.substr (second_token_position + TAO_POA::name_separator_length (), + object_key.length ()); - id = TAO_POA::string_to_ObjectId (objectId.c_str ()); + id = TAO_POA::string_to_ObjectId (objectId.c_str ()); - // Success - return 0; - } + // Success + return 0; +} + +CORBA::Boolean +TAO_POA::persistent (void) +{ + return this->policies ().lifespan () == PortableServer::TRANSIENT; +} + +const TAO_POA::String & +TAO_POA::object_key_type (void) +{ + if (this->persistent ()) + return TAO_POA::persistent_key_type (); + else + return TAO_POA::transient_key_type (); +} + +const TAO_POA::String & +TAO_POA::persistent_key_type (void) +{ + static TAO_POA::String persistent = "Persistent"; + return persistent; +} + +const TAO_POA::String & +TAO_POA::transient_key_type (void) +{ + static TAO_POA::String transient = "Transient"; + return transient; } PortableServer::ObjectId * @@ -1841,6 +1900,8 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) // Calculate the required buffer size. // Note: 1 is for the null terminator int buffer_size = + this->object_key_type ().length () + + TAO_POA::name_separator_length () + this->complete_name_.length () + TAO_POA::name_separator_length () + id.length () + @@ -1854,7 +1915,9 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) // Make an object key ACE_OS::sprintf ((CORBA::String) buffer, - "%s%c%s", + "%s%c%s%c%s", + this->object_key_type ().c_str (), + TAO_POA::name_separator (), this->complete_name_.c_str (), TAO_POA::name_separator (), id_buffer); @@ -1867,18 +1930,6 @@ TAO_POA::create_object_key (const PortableServer::ObjectId &id) CORBA::B_TRUE); } -PortableServer::POA_ptr -TAO_POA::_this (CORBA_Environment &env) -{ - STUB_Object *stub = new IIOP_Object (CORBA::string_copy (this->_interface_repository_id ()), - TAO_ORB_Core_instance ()->orb_params ()->addr (), - 0); - if (env.exception () != 0) - return 0; - - return new POA_PortableServer::_tao_collocated_POA (this, stub); -} - int TAO_POA::is_poa_generated_id (const PortableServer::ObjectId& id) { diff --git a/TAO/tao/poa.h b/TAO/tao/poa.h index ebc5cb6a419..e9e62f2a6cc 100644 --- a/TAO/tao/poa.h +++ b/TAO/tao/poa.h @@ -319,8 +319,6 @@ public: virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA::Environment &env); - PortableServer::POA_ptr _this (CORBA::Environment &_tao_environment); - static char *ObjectId_to_string (const PortableServer::ObjectId &id); static wchar_t *ObjectId_to_wstring (const PortableServer::ObjectId &id); @@ -459,7 +457,16 @@ protected: virtual int parse_key (const TAO::ObjectKey &key, String &poa_name, - PortableServer::ObjectId_out id); + PortableServer::ObjectId_out id, + CORBA::Boolean &persistent); + + virtual CORBA::Boolean persistent (void); + + virtual const String &object_key_type (void); + + static const String &persistent_key_type (void); + + static const String &transient_key_type (void); static const char *ObjectId_to_const_string (const PortableServer::ObjectId &id); diff --git a/TAO/tao/poaC.cpp b/TAO/tao/poaC.cpp index 60365554983..037a7790d54 100644 --- a/TAO/tao/poaC.cpp +++ b/TAO/tao/poaC.cpp @@ -7,9 +7,10 @@ #include "tao/corba.h" #include "poaC.h" +#include "poaS.h" #if !defined (__ACE_INLINE__) -#include "POAC.i" +#include "poaC.i" #endif // !defined INLINE static const CORBA::Long _oc_PortableServer_Identifier[] = @@ -42,39 +43,35 @@ PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_duplicate (Portabl return obj; } // end of _duplicate -PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::CurrentBase::_nil (); - if (!obj->_is_a ("IDL:PortableServer/CurrentBase:1.0", env)) return PortableServer::CurrentBase::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::CurrentBase_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::CurrentBase::_nil (); + + new_obj = new PortableServer::CurrentBase (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::CurrentBase::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::CurrentBase_ptr new_obj; // to be returned - new_obj = new PortableServer::CurrentBase (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::CurrentBase *servant = - (POA_PortableServer::CurrentBase *) obj->_servant ()->_downcast ("IDL:PortableServer/CurrentBase:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::CurrentBase::_nil (); - - return new POA_PortableServer::_tao_collocated_CurrentBase (servant, istub); - -} // end of _narrow - -PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_nil (void) -{ - return (PortableServer::CurrentBase_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/CurrentBase:1.0"); + return new POA_PortableServer::_tao_collocated_CurrentBase( + ACE_reinterpret_cast(POA_PortableServer::CurrentBase_ptr, servant), + stub + ); +} PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -94,14 +91,14 @@ PortableServer::CurrentBase_ptr PortableServer::CurrentBase::_bind (const char * return PortableServer::CurrentBase::_narrow (objref, env); } -CORBA::Boolean PortableServer::CurrentBase::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::CurrentBase::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_CurrentBase[] = @@ -121,39 +118,35 @@ PortableServer::Policy_ptr PortableServer::Policy::_duplicate (PortableServer::P return obj; } // end of _duplicate -PortableServer::Policy_ptr PortableServer::Policy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::Policy_ptr PortableServer::Policy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::Policy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/Policy:1.0", env)) return PortableServer::Policy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::Policy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::Policy::_nil (); + + new_obj = new PortableServer::Policy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::Policy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::Policy_ptr new_obj; // to be returned - new_obj = new PortableServer::Policy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::Policy *servant = - (POA_PortableServer::Policy *) obj->_servant ()->_downcast ("IDL:PortableServer/Policy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::Policy::_nil (); - - return new POA_PortableServer::_tao_collocated_Policy (servant, istub); - -} // end of _narrow - -PortableServer::Policy_ptr PortableServer::Policy::_nil (void) -{ - return (PortableServer::Policy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Policy:1.0"); + return new POA_PortableServer::_tao_collocated_Policy( + ACE_reinterpret_cast(POA_PortableServer::Policy_ptr, servant), + stub + ); +} PortableServer::Policy_ptr PortableServer::Policy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -220,14 +213,14 @@ void PortableServer::Policy::destroy (CORBA::Environment &env) } -CORBA::Boolean PortableServer::Policy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::Policy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_Policy[] = @@ -240,168 +233,9 @@ static CORBA::TypeCode _tc__tc_PortableServer_Policy (CORBA::tk_objref, sizeof ( CORBA::TypeCode_ptr PortableServer::_tc_Policy = &_tc__tc_PortableServer_Policy; -#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_TAO_OBJREFMNGTYPE_CS_) -#define _PORTABLESERVER__TAO_SEQ_POLICY_TAO_OBJREFMNGTYPE_CS_ - -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::TAO_ObjRefMngType(const PortableServer::_tao_seq_Policy::TAO_ObjRefMngType &_tao_mng_type) -{ - *this->ptr_ = PortableServer::Policy::_duplicate (*_tao_mng_type.ptr_); - this->release_ = _tao_mng_type.release_; -} - -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType& -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::operator= (const PortableServer::_tao_seq_Policy::TAO_ObjRefMngType &_tao_mng_type) -{ - if (this == &_tao_mng_type) return *this; - if (this->release_) // need to free old one - CORBA::release (*this->ptr_); - *this->ptr_ = PortableServer::Policy::_duplicate (*_tao_mng_type.ptr_); - return *this; -} - -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType & -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::operator= (PortableServer::Policy_ptr p) -{ - if (this->release_) // need to free old one - CORBA::release (*this->ptr_); - *this->ptr_ = p; // no copy - return *this; -} - -// mapping for variable size -PortableServer::Policy_ptr & -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::out (void) -{ - if (this->release_) - CORBA::release (*this->ptr_); - *this->ptr_ = PortableServer::Policy::_nil (); - return *this->ptr_; -} - -PortableServer::Policy_ptr -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::_retn (void) -{ - PortableServer::Policy_ptr tmp = *this->ptr_; - *this->ptr_ = PortableServer::Policy::_nil (); - return tmp; -} - - -#endif // end #if !defined - - #if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CS_) #define _PORTABLESERVER__TAO_SEQ_POLICY_CS_ -// ************************************************************* -// class PortableServer::_tao_seq_Policy -// ************************************************************* - -// copy constructor -PortableServer::_tao_seq_Policy::_tao_seq_Policy (const PortableServer::_tao_seq_Policy &seq) - : maximum_ (seq.maximum_), - length_ (seq.length_), - buffer_ (PortableServer::_tao_seq_Policy::allocbuf (seq.maximum_)), - release_ (1) // we always own it -{ - for (CORBA::ULong i=0; i < seq.length_; i++) - { - this->buffer_[i] = PortableServer::Policy::_duplicate (seq.buffer_[i]); - } -} - -// constructor for unbounded seq -PortableServer::_tao_seq_Policy::_tao_seq_Policy(CORBA::ULong max ) - : maximum_ (max), - length_ (0), - buffer_ (PortableServer::_tao_seq_Policy::allocbuf (max)), - release_ (1) // owns -{ -} - -// constructor from data buffer -PortableServer::_tao_seq_Policy::_tao_seq_Policy (CORBA::ULong max, CORBA::ULong length, - PortableServer::Policy_ptr *value, CORBA::Boolean release) - : maximum_ (max), - length_ (length), - buffer_ (value), - release_ (release) // ownership depends on release -{ -} - -// destructor -PortableServer::_tao_seq_Policy::~_tao_seq_Policy (void) -{ - if (this->release_) // we own the buffer - { - PortableServer::_tao_seq_Policy::freebuf (this->buffer_, this->maximum_); - } -} - -// assignment operator -PortableServer::_tao_seq_Policy& -PortableServer::_tao_seq_Policy::operator= (const PortableServer::_tao_seq_Policy &seq) -{ - if (this == &seq) return *this; - if (this->release_) - { - PortableServer::_tao_seq_Policy::freebuf (this->buffer_, this->maximum_); - } - this->length_ = seq.length_; - this->maximum_ = seq.maximum_; - this->buffer_ = PortableServer::_tao_seq_Policy::allocbuf (seq.maximum_), - this->release_ = 1; // we always own it - for (CORBA::ULong i=0; i < seq.length_; i++) - { - this->buffer_[i] = PortableServer::Policy::_duplicate (seq.buffer_[i]); - } - return *this; -} - -void -PortableServer::_tao_seq_Policy::length (CORBA::ULong length) -{ - if (length > this->maximum_) // need realloc - { - PortableServer::Policy_ptr *tmp = PortableServer::_tao_seq_Policy::allocbuf (length); - if (!tmp) - return; - CORBA::ULong i; - // copy old buffer - for (i=0; i < this->length_; i++) - { - tmp[i] = PortableServer::Policy::_duplicate (this->buffer_[i]); - } - if (this->release_) // free old one if we own it - { - PortableServer::_tao_seq_Policy::freebuf (this->buffer_, this->maximum_); - } - //assign the newly reallocated buffer - this->buffer_ = tmp; - this->release_ = 1; //after reallocation, we own it - this->maximum_ = length; - } - this->length_ = length; -} - -PortableServer::Policy_ptr * -PortableServer::_tao_seq_Policy::allocbuf (CORBA::ULong nelems) -{ - PortableServer::Policy_ptr *buf = new PortableServer::Policy_ptr[nelems]; // allocate from heap - for (CORBA::ULong i=0; i < nelems; i++) - buf[i] = PortableServer::Policy::_nil (); - return buf; -} - -void -PortableServer::_tao_seq_Policy::freebuf (PortableServer::Policy_ptr *seq, CORBA::ULong nelems) -{ - if (!seq) return; // null sequence - for (CORBA::ULong i=0; i < nelems; i++) - CORBA::release (seq[i]); - PortableServer::_tao_seq_Policy::freebuf (seq); -} - static const CORBA::Long _oc_PortableServer__tao_seq_Policy[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -440,100 +274,6 @@ CORBA::TypeCode_ptr PortableServer::_tc_PolicyList = &_tc__tc_PortableServer_Pol #if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CS_) #define _PORTABLESERVER__TAO_SEQ_OCTET_CS_ -// ************************************************************* -// class PortableServer::_tao_seq_Octet -// ************************************************************* - -// copy constructor -PortableServer::_tao_seq_Octet::_tao_seq_Octet (const PortableServer::_tao_seq_Octet &seq) - : maximum_ (seq.maximum_), - length_ (seq.length_), - buffer_ (PortableServer::_tao_seq_Octet::allocbuf (seq.maximum_)), - release_ (1) // we always own it -{ - for (CORBA::ULong i=0; i < seq.length_; i++) - this->buffer_[i] = seq.buffer_[i]; -} - -// constructor for unbounded seq -PortableServer::_tao_seq_Octet::_tao_seq_Octet(CORBA::ULong max ) - : maximum_ (max), - length_ (0), - buffer_ (PortableServer::_tao_seq_Octet::allocbuf (max)), - release_ (1) // owns -{ -} - -// constructor from data buffer -PortableServer::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, - CORBA::Octet *value, CORBA::Boolean release) - : maximum_ (max), - length_ (length), - buffer_ (value), - release_ (release) // ownership depends on release -{ -} - -// destructor -PortableServer::_tao_seq_Octet::~_tao_seq_Octet (void) -{ - if (this->release_) // we own the buffer - { - PortableServer::_tao_seq_Octet::freebuf (this->buffer_); - } -} - -// assignment operator -PortableServer::_tao_seq_Octet& -PortableServer::_tao_seq_Octet::operator= (const PortableServer::_tao_seq_Octet &seq) -{ - if (this == &seq) return *this; - if (this->release_) - { - PortableServer::_tao_seq_Octet::freebuf (this->buffer_); - } - this->length_ = seq.length_; - this->maximum_ = seq.maximum_; - this->buffer_ = PortableServer::_tao_seq_Octet::allocbuf (seq.maximum_), - this->release_ = 1; // we always own it - for (CORBA::ULong i=0; i < seq.length_; i++) - this->buffer_[i] = seq.buffer_[i]; - return *this; -} - -void -PortableServer::_tao_seq_Octet::length (CORBA::ULong length) -{ - if (length > this->maximum_) // need realloc - { - CORBA::Octet *tmp = PortableServer::_tao_seq_Octet::allocbuf (length); - if (!tmp) - return; - CORBA::ULong i; - // copy old buffer - for (i=0; i < this->length_; i++) - { - tmp[i] = this->buffer_[i]; - } - if (this->release_) // free old one if we own it - { - PortableServer::_tao_seq_Octet::freebuf (this->buffer_); - } - //assign the newly reallocated buffer - this->buffer_ = tmp; - this->release_ = 1; //after reallocation, we own it - this->maximum_ = length; - } - this->length_ = length; -} - -CORBA::Octet * -PortableServer::_tao_seq_Octet::allocbuf (CORBA::ULong nelems) -{ - CORBA::Octet *buf = new CORBA::Octet [nelems]; // allocate from heap - return buf; -} - static const CORBA::Long _oc_PortableServer__tao_seq_Octet[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -627,39 +367,35 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (Porta return obj; } // end of _duplicate -PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::ThreadPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ThreadPolicy:1.0", env)) return PortableServer::ThreadPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::ThreadPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::ThreadPolicy::_nil (); + + new_obj = new PortableServer::ThreadPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::ThreadPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::ThreadPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::ThreadPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::ThreadPolicy *servant = - (POA_PortableServer::ThreadPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/ThreadPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::ThreadPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_ThreadPolicy (servant, istub); - -} // end of _narrow - -PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_nil (void) -{ - return (PortableServer::ThreadPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ThreadPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_ThreadPolicy( + ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant), + stub + ); +} PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -702,15 +438,15 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env } -CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ThreadPolicy[] = @@ -743,39 +479,35 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (P return obj; } // end of _duplicate -PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::LifespanPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/LifespanPolicy:1.0", env)) return PortableServer::LifespanPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::LifespanPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::LifespanPolicy::_nil (); + + new_obj = new PortableServer::LifespanPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::LifespanPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::LifespanPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::LifespanPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::LifespanPolicy *servant = - (POA_PortableServer::LifespanPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/LifespanPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::LifespanPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_LifespanPolicy (servant, istub); - -} // end of _narrow - -PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_nil (void) -{ - return (PortableServer::LifespanPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/LifespanPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_LifespanPolicy( + ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant), + stub + ); +} PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -818,15 +550,15 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: } -CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_LifespanPolicy[] = @@ -859,39 +591,35 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_dupl return obj; } // end of _duplicate -PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::IdUniquenessPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/IdUniquenessPolicy:1.0", env)) return PortableServer::IdUniquenessPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::IdUniquenessPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::IdUniquenessPolicy::_nil (); + + new_obj = new PortableServer::IdUniquenessPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::IdUniquenessPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::IdUniquenessPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::IdUniquenessPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::IdUniquenessPolicy *servant = - (POA_PortableServer::IdUniquenessPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/IdUniquenessPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::IdUniquenessPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (servant, istub); - -} // end of _narrow - -PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_nil (void) -{ - return (PortableServer::IdUniquenessPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdUniquenessPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy( + ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant), + stub + ); +} PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -934,15 +662,15 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu } -CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] = @@ -975,39 +703,35 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_dupl return obj; } // end of _duplicate -PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::IdAssignmentPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/IdAssignmentPolicy:1.0", env)) return PortableServer::IdAssignmentPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::IdAssignmentPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::IdAssignmentPolicy::_nil (); + + new_obj = new PortableServer::IdAssignmentPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::IdAssignmentPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::IdAssignmentPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::IdAssignmentPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::IdAssignmentPolicy *servant = - (POA_PortableServer::IdAssignmentPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/IdAssignmentPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::IdAssignmentPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (servant, istub); - -} // end of _narrow - -PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_nil (void) -{ - return (PortableServer::IdAssignmentPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdAssignmentPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy( + ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant), + stub + ); +} PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1050,15 +774,15 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu } -CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] = @@ -1091,39 +815,35 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP return obj; } // end of _duplicate -PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::ImplicitActivationPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ImplicitActivationPolicy:1.0", env)) return PortableServer::ImplicitActivationPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::ImplicitActivationPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::ImplicitActivationPolicy::_nil (); + + new_obj = new PortableServer::ImplicitActivationPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::ImplicitActivationPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::ImplicitActivationPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::ImplicitActivationPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::ImplicitActivationPolicy *servant = - (POA_PortableServer::ImplicitActivationPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/ImplicitActivationPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::ImplicitActivationPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (servant, istub); - -} // end of _narrow - -PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_nil (void) -{ - return (PortableServer::ImplicitActivationPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ImplicitActivationPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy( + ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant), + stub + ); +} PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1166,15 +886,15 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation } -CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] = @@ -1207,39 +927,35 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic return obj; } // end of _duplicate -PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::ServantRetentionPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantRetentionPolicy:1.0", env)) return PortableServer::ServantRetentionPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::ServantRetentionPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::ServantRetentionPolicy::_nil (); + + new_obj = new PortableServer::ServantRetentionPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::ServantRetentionPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::ServantRetentionPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::ServantRetentionPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::ServantRetentionPolicy *servant = - (POA_PortableServer::ServantRetentionPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/ServantRetentionPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::ServantRetentionPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (servant, istub); - -} // end of _narrow - -PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_nil (void) -{ - return (PortableServer::ServantRetentionPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantRetentionPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy( + ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant), + stub + ); +} PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1282,15 +998,15 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli } -CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] = @@ -1324,39 +1040,35 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol return obj; } // end of _duplicate -PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::RequestProcessingPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/RequestProcessingPolicy:1.0", env)) return PortableServer::RequestProcessingPolicy::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::RequestProcessingPolicy_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::RequestProcessingPolicy::_nil (); + + new_obj = new PortableServer::RequestProcessingPolicy (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::RequestProcessingPolicy::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::RequestProcessingPolicy_ptr new_obj; // to be returned - new_obj = new PortableServer::RequestProcessingPolicy (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::RequestProcessingPolicy *servant = - (POA_PortableServer::RequestProcessingPolicy *) obj->_servant ()->_downcast ("IDL:PortableServer/RequestProcessingPolicy:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::RequestProcessingPolicy::_nil (); - - return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (servant, istub); - -} // end of _narrow - -PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_nil (void) -{ - return (PortableServer::RequestProcessingPolicy_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/RequestProcessingPolicy:1.0"); + return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy( + ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant), + stub + ); +} PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1399,15 +1111,15 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo } -CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] = @@ -1427,39 +1139,36 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableS return obj; } // end of _duplicate -PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::POAManager::_nil (); - if (!obj->_is_a ("IDL:PortableServer/POAManager:1.0", env)) return PortableServer::POAManager::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::POAManager_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::POAManager::_nil (); + + new_obj = new PortableServer::POAManager (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::POAManager::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::POAManager_ptr new_obj; // to be returned - new_obj = new PortableServer::POAManager (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::POAManager *servant = - (POA_PortableServer::POAManager *) obj->_servant ()->_downcast ("IDL:PortableServer/POAManager:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::POAManager::_nil (); - - return new POA_PortableServer::_tao_collocated_POAManager (servant, istub); + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POAManager:1.0"); + return new POA_PortableServer::_tao_collocated_POAManager( + ACE_reinterpret_cast(POA_PortableServer::POAManager_ptr, servant), + stub + ); } -PortableServer::POAManager_ptr PortableServer::POAManager::_nil (void) -{ - return (PortableServer::POAManager_ptr)NULL; -} // end of _nil - PortableServer::POAManager_ptr PortableServer::POAManager::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { CORBA::Object_ptr objref = CORBA::Object::_nil (); @@ -1608,14 +1317,14 @@ void PortableServer::POAManager::deactivate (CORBA::Boolean etherealize_objects } -CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_POAManager[] = @@ -1635,39 +1344,36 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicat return obj; } // end of _duplicate -PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::AdapterActivator::_nil (); - if (!obj->_is_a ("IDL:PortableServer/AdapterActivator:1.0", env)) return PortableServer::AdapterActivator::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::AdapterActivator_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::AdapterActivator::_nil (); + + new_obj = new PortableServer::AdapterActivator (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::AdapterActivator::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::AdapterActivator_ptr new_obj; // to be returned - new_obj = new PortableServer::AdapterActivator (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::AdapterActivator *servant = - (POA_PortableServer::AdapterActivator *) obj->_servant ()->_downcast ("IDL:PortableServer/AdapterActivator:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::AdapterActivator::_nil (); - - return new POA_PortableServer::_tao_collocated_AdapterActivator (servant, istub); + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/AdapterActivator:1.0"); + return new POA_PortableServer::_tao_collocated_AdapterActivator( + ACE_reinterpret_cast(POA_PortableServer::AdapterActivator_ptr, servant), + stub + ); } -PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_nil (void) -{ - return (PortableServer::AdapterActivator_ptr)NULL; -} // end of _nil - PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { CORBA::Object_ptr objref = CORBA::Object::_nil (); @@ -1713,14 +1419,14 @@ CORBA::Boolean PortableServer::AdapterActivator::unknown_adapter (PortableServe } -CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_AdapterActivator[] = @@ -1740,39 +1446,35 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (P return obj; } // end of _duplicate -PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::ServantManager::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantManager:1.0", env)) return PortableServer::ServantManager::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::ServantManager_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::ServantManager::_nil (); + + new_obj = new PortableServer::ServantManager (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::ServantManager::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::ServantManager_ptr new_obj; // to be returned - new_obj = new PortableServer::ServantManager (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::ServantManager *servant = - (POA_PortableServer::ServantManager *) obj->_servant ()->_downcast ("IDL:PortableServer/ServantManager:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::ServantManager::_nil (); - - return new POA_PortableServer::_tao_collocated_ServantManager (servant, istub); - -} // end of _narrow - -PortableServer::ServantManager_ptr PortableServer::ServantManager::_nil (void) -{ - return (PortableServer::ServantManager_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantManager:1.0"); + return new POA_PortableServer::_tao_collocated_ServantManager( + ACE_reinterpret_cast(POA_PortableServer::ServantManager_ptr, servant), + stub + ); +} PortableServer::ServantManager_ptr PortableServer::ServantManager::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1792,14 +1494,14 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_bind (const return PortableServer::ServantManager::_narrow (objref, env); } -CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantManager[] = @@ -1819,39 +1521,35 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicat return obj; } // end of _duplicate -PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::ServantActivator::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantActivator:1.0", env)) return PortableServer::ServantActivator::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::ServantActivator_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::ServantActivator::_nil (); + + new_obj = new PortableServer::ServantActivator (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::ServantActivator::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::ServantActivator_ptr new_obj; // to be returned - new_obj = new PortableServer::ServantActivator (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::ServantActivator *servant = - (POA_PortableServer::ServantActivator *) obj->_servant ()->_downcast ("IDL:PortableServer/ServantActivator:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::ServantActivator::_nil (); - - return new POA_PortableServer::_tao_collocated_ServantActivator (servant, istub); - -} // end of _narrow - -PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_nil (void) -{ - return (PortableServer::ServantActivator_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantActivator:1.0"); + return new POA_PortableServer::_tao_collocated_ServantActivator( + ACE_reinterpret_cast(POA_PortableServer::ServantActivator_ptr, servant), + stub + ); +} PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1885,15 +1583,15 @@ void PortableServer::ServantActivator::etherealize (const PortableServer::Objec } -CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantActivator[] = @@ -1913,39 +1611,35 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (P return obj; } // end of _duplicate -PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::ServantLocator::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantLocator:1.0", env)) return PortableServer::ServantLocator::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::ServantLocator_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::ServantLocator::_nil (); + + new_obj = new PortableServer::ServantLocator (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::ServantLocator::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::ServantLocator_ptr new_obj; // to be returned - new_obj = new PortableServer::ServantLocator (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::ServantLocator *servant = - (POA_PortableServer::ServantLocator *) obj->_servant ()->_downcast ("IDL:PortableServer/ServantLocator:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::ServantLocator::_nil (); - - return new POA_PortableServer::_tao_collocated_ServantLocator (servant, istub); - -} // end of _narrow - -PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_nil (void) -{ - return (PortableServer::ServantLocator_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantLocator:1.0"); + return new POA_PortableServer::_tao_collocated_ServantLocator( + ACE_reinterpret_cast(POA_PortableServer::ServantLocator_ptr, servant), + stub + ); +} PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -1979,15 +1673,15 @@ void PortableServer::ServantLocator::postinvoke (const PortableServer::ObjectId } -CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_ServantLocator[] = @@ -2007,39 +1701,35 @@ PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr return obj; } // end of _duplicate -PortableServer::POA_ptr PortableServer::POA::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::POA_ptr PortableServer::POA::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::POA::_nil (); - if (!obj->_is_a ("IDL:PortableServer/POA:1.0", env)) - return PortableServer::POA::_nil (); - - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) return PortableServer::POA::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) + if (!obj->_is_collocated () || !obj->_servant()) { + STUB_Object *istub; PortableServer::POA_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::POA::_nil (); + new_obj = new PortableServer::POA (istub); // construct obj ref using the stub object return new_obj; } // end of if - - POA_PortableServer::POA *servant = - (POA_PortableServer::POA *) obj->_servant ()->_downcast ("IDL:PortableServer/POA:1.0"); - - if (servant == 0) - return PortableServer::POA::_nil (); - return new POA_PortableServer::_tao_collocated_POA (servant, istub); - -} // end of _narrow - -PortableServer::POA_ptr PortableServer::POA::_nil (void) -{ - return (PortableServer::POA_ptr)NULL; -} // end of _nil + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) + return PortableServer::POA::_nil (); + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POA:1.0"); + return new POA_PortableServer::_tao_collocated_POA( + ACE_reinterpret_cast(POA_PortableServer::POA_ptr, servant), + stub + ); +} PortableServer::POA_ptr PortableServer::POA::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -3045,14 +2735,14 @@ CORBA::Object_ptr PortableServer::POA::id_to_reference (const PortableServer::O } -CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_POA[] = @@ -3072,39 +2762,35 @@ PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer: return obj; } // end of _duplicate -PortableServer::Current_ptr PortableServer::Current::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env) +PortableServer::Current_ptr PortableServer::Current::_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &env + ) { - if (CORBA::is_nil (obj)) + if (CORBA::is_nil (obj)) return PortableServer::Current::_nil (); - if (!obj->_is_a ("IDL:PortableServer/Current:1.0", env)) return PortableServer::Current::_nil (); + if (!obj->_is_collocated () || !obj->_servant()) + { + STUB_Object *istub; + PortableServer::Current_ptr new_obj; // to be returned + if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) + return PortableServer::Current::_nil (); + + new_obj = new PortableServer::Current (istub); // construct obj ref using the stub object + return new_obj; + } // end of if - STUB_Object *istub; - if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - return PortableServer::Current::_nil (); - - if (!obj->_is_collocated () || obj->_servant () == 0) - { - PortableServer::Current_ptr new_obj; // to be returned - new_obj = new PortableServer::Current (istub); // construct obj ref using the stub object - return new_obj; - } - - POA_PortableServer::Current *servant = - (POA_PortableServer::Current *) obj->_servant ()->_downcast ("IDL:PortableServer/Current:1.0"); - - if (servant == 0) + STUB_Object *stub = obj->_servant ()->_create_stub (env); + if (env.exception () != 0) return PortableServer::Current::_nil (); - - return new POA_PortableServer::_tao_collocated_Current (servant, istub); - -} // end of _narrow - -PortableServer::Current_ptr PortableServer::Current::_nil (void) -{ - return (PortableServer::Current_ptr)NULL; -} // end of _nil + void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Current:1.0"); + return new POA_PortableServer::_tao_collocated_Current( + ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant), + stub + ); +} PortableServer::Current_ptr PortableServer::Current::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env) { @@ -3206,15 +2892,15 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro } -CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::Environment &env) +CORBA::Boolean PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment) { if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, env); // remote call + return this->CORBA_Object::_is_a (value, _tao_environment); // remote call } static const CORBA::Long _oc_PortableServer_Current[] = diff --git a/TAO/tao/poaC.h b/TAO/tao/poaC.h index a90172d9b38..1bd271a90b1 100644 --- a/TAO/tao/poaC.h +++ b/TAO/tao/poaC.h @@ -16,9 +16,9 @@ public: typedef TAO_ServantBase ServantBase; typedef ServantBase *Servant; - + typedef TAO_Local_ServantBase LocalServantBase; - + typedef CORBA::String Identifier; typedef CORBA::String_var Identifier_var; typedef CORBA::String_out Identifier_out; @@ -111,57 +111,60 @@ class CurrentBase; virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); protected: - CurrentBase (void); // default constructor - CurrentBase (STUB_Object *objref); - public: -virtual ~CurrentBase (void); -private: - CurrentBase (const CurrentBase&); - void operator= (const CurrentBase&); -}; + CurrentBase ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~CurrentBase (void); + private: + CurrentBase (const CurrentBase&); + void operator= (const CurrentBase&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_CurrentBase; - + static CORBA::TypeCode_ptr _tc_CurrentBase; + #if !defined (_PORTABLESERVER_POLICY___PTR_CH_) #define _PORTABLESERVER_POLICY___PTR_CH_ class Policy; -typedef Policy *Policy_ptr; - + typedef Policy *Policy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POLICY___VAR_CH_) #define _PORTABLESERVER_POLICY___VAR_CH_ -class TAO_Export Policy_var -{ -public: - Policy_var (void); // default constructor - Policy_var (Policy_ptr); - Policy_var (const Policy_var &); // copy constructor - ~Policy_var (void); // destructor - - Policy_var &operator= (Policy_ptr); - Policy_var &operator= (const Policy_var &); - Policy_ptr operator-> (void) const; - - operator const Policy_ptr &() const; - operator Policy_ptr &(); - // in, inout, out, _retn - Policy_ptr in (void) const; - Policy_ptr &inout (void); - Policy_ptr &out (void); - Policy_ptr _retn (void); - Policy_ptr ptr (void) const; - -private: - Policy_ptr ptr_; -}; + class TAO_Export Policy_var + { + public: + Policy_var (void); // default constructor + Policy_var (Policy_ptr); + Policy_var (const Policy_var &); // copy constructor + ~Policy_var (void); // destructor + + Policy_var &operator= (Policy_ptr); + Policy_var &operator= (const Policy_var &); + Policy_ptr operator-> (void) const; + + operator const Policy_ptr &() const; + operator Policy_ptr &(); + // in, inout, out, _retn + Policy_ptr in (void) const; + Policy_ptr &inout (void); + Policy_ptr &out (void); + Policy_ptr _retn (void); + Policy_ptr ptr (void) const; + + private: + Policy_ptr ptr_; + }; #endif // end #if !defined @@ -170,22 +173,22 @@ private: #if !defined (_PORTABLESERVER_POLICY___OUT_CH_) #define _PORTABLESERVER_POLICY___OUT_CH_ -class TAO_Export Policy_out -{ -public: - Policy_out (Policy_ptr &); - Policy_out (Policy_var &); - Policy_out (Policy_out &); - Policy_out &operator= (Policy_out &); - Policy_out &operator= (const Policy_var &); - Policy_out &operator= (Policy_ptr); - operator Policy_ptr &(); - Policy_ptr &ptr (void); - Policy_ptr operator-> (void); - -private: - Policy_ptr &ptr_; -}; + class TAO_Export Policy_out + { + public: + Policy_out (Policy_ptr &); + Policy_out (Policy_var &); + Policy_out (Policy_out &); + Policy_out &operator= (Policy_out &); + Policy_out &operator= (const Policy_var &); + Policy_out &operator= (Policy_ptr); + operator Policy_ptr &(); + Policy_ptr &ptr (void); + Policy_ptr operator-> (void); + + private: + Policy_ptr &ptr_; + }; #endif // end #if !defined @@ -194,91 +197,47 @@ private: #if !defined (_PORTABLESERVER_POLICY_CH_) #define _PORTABLESERVER_POLICY_CH_ -class TAO_Export Policy: public virtual CORBA::Object -{ -public: - // the static operations - static Policy_ptr _duplicate (Policy_ptr obj); - static Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); - static Policy_ptr _nil (void); - static Policy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - - virtual Policy_ptr copy (CORBA::Environment &env); - virtual void destroy (CORBA::Environment &env); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: - Policy (void); // default constructor - Policy (STUB_Object *objref); - public: -virtual ~Policy (void); -private: -Policy (const Policy&); -void operator= (const Policy&); -}; + class TAO_Export Policy: public virtual CORBA::Object + { + public: + // the static operations + static Policy_ptr _duplicate (Policy_ptr obj); + static Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static Policy_ptr _nil (void); + static Policy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual Policy_ptr copy (CORBA::Environment &env); + virtual void destroy (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + Policy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~Policy (void); + private: + Policy (const Policy&); + void operator= (const Policy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_Policy; + static CORBA::TypeCode_ptr _tc_Policy; #if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CH_) #define _PORTABLESERVER__TAO_SEQ_POLICY_CH_ -// ************************************************************* -// class _tao_seq_Policy -// ************************************************************* - -class TAO_Export _tao_seq_Policy -{ -public: -class TAO_Export TAO_ObjRefMngType -{ -public: - friend _tao_seq_Policy; - TAO_ObjRefMngType(const TAO_ObjRefMngType &); // copy ctor - TAO_ObjRefMngType(Policy_ptr*, CORBA::Boolean release); - ~TAO_ObjRefMngType (void); // destructor + // ************************************************************* + // _tao_seq_Policy + // ************************************************************* - TAO_ObjRefMngType &operator= (const TAO_ObjRefMngType&); - TAO_ObjRefMngType &operator= (Policy_ptr); - operator const Policy_ptr &() const; - operator Policy_ptr &(); - // in, inout, out, _retn - const Policy_ptr in (void) const; - Policy_ptr &inout (void); - Policy_ptr &out (void); - Policy_ptr _retn (void); - -private: - Policy_ptr *ptr_; - CORBA::Boolean release_; -}; - -_tao_seq_Policy (void); // default constructor -_tao_seq_Policy (CORBA::ULong max); -_tao_seq_Policy (CORBA::ULong max, CORBA::ULong length, - Policy_ptr *value, CORBA::Boolean release=CORBA::B_FALSE); -_tao_seq_Policy(const _tao_seq_Policy &); // copy constructor -~_tao_seq_Policy (void); -_tao_seq_Policy &operator= (const _tao_seq_Policy &); -CORBA::ULong maximum (void) const; -void length (CORBA::ULong); -CORBA::ULong length (void) const; -ACE_NESTED_CLASS (PortableServer,_tao_seq_Policy::TAO_ObjRefMngType) operator[] (CORBA::ULong index); -const ACE_NESTED_CLASS (PortableServer,_tao_seq_Policy::TAO_ObjRefMngType) operator[] (CORBA::ULong index) const; -static Policy_ptr *allocbuf (CORBA::ULong nelems); -static void freebuf (Policy_ptr *); -static void freebuf ( -Policy_ptr *, CORBA::ULong); -private: -CORBA::ULong maximum_; -CORBA::ULong length_; -Policy_ptr *buffer_; -CORBA::Boolean release_; -}; -typedef _tao_seq_Policy* _tao_seq_Policy_ptr; -static CORBA::TypeCode_ptr _tc__tao_seq_Policy; + typedef TAO_Unbounded_Object_Sequence _tao_seq_Policy; + typedef _tao_seq_Policy* _tao_seq_Policy_ptr; + static CORBA::TypeCode_ptr _tc__tao_seq_Policy; #endif // end #if !defined @@ -288,36 +247,36 @@ static CORBA::TypeCode_ptr _tc__tao_seq_Policy; #define _PORTABLESERVER__TAO_SEQ_POLICY___VAR_CH_ // ************************************************************* -// class PortableServer::_tao_seq_Policy_var -// ************************************************************* + // class PortableServer::_tao_seq_Policy_var + // ************************************************************* -class TAO_Export _tao_seq_Policy_var -{ -public: -_tao_seq_Policy_var (void); // default constructor -_tao_seq_Policy_var (_tao_seq_Policy *); -_tao_seq_Policy_var (const _tao_seq_Policy_var &); // copy constructor -~_tao_seq_Policy_var (void); // destructor - -_tao_seq_Policy_var &operator= (_tao_seq_Policy *); -_tao_seq_Policy_var &operator= (const _tao_seq_Policy_var &); -_tao_seq_Policy *operator-> (void); -const _tao_seq_Policy *operator-> (void) const; - -operator const _tao_seq_Policy &() const; -operator _tao_seq_Policy &(); -operator _tao_seq_Policy &() const; -ACE_NESTED_CLASS (PortableServer,_tao_seq_Policy::TAO_ObjRefMngType) operator[] (CORBA::ULong index); -// in, inout, out, _retn -const _tao_seq_Policy &in (void) const; -_tao_seq_Policy &inout (void); -_tao_seq_Policy *&out (void); -_tao_seq_Policy *_retn (void); -_tao_seq_Policy *ptr (void) const; - -private: -_tao_seq_Policy *ptr_; -}; + class TAO_Export _tao_seq_Policy_var + { + public: + _tao_seq_Policy_var (void); // default constructor + _tao_seq_Policy_var (_tao_seq_Policy *); + _tao_seq_Policy_var (const _tao_seq_Policy_var &); // copy constructor + ~_tao_seq_Policy_var (void); // destructor + + _tao_seq_Policy_var &operator= (_tao_seq_Policy *); + _tao_seq_Policy_var &operator= (const _tao_seq_Policy_var &); + _tao_seq_Policy *operator-> (void); + const _tao_seq_Policy *operator-> (void) const; + + operator const _tao_seq_Policy &() const; + operator _tao_seq_Policy &(); + operator _tao_seq_Policy &() const; + TAO_Object_Manager operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_Policy &in (void) const; + _tao_seq_Policy &inout (void); + _tao_seq_Policy *&out (void); + _tao_seq_Policy *_retn (void); + _tao_seq_Policy *ptr (void) const; + + private: + _tao_seq_Policy *ptr_; + }; #endif // end #if !defined @@ -326,36 +285,36 @@ _tao_seq_Policy *ptr_; #if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___OUT_CH_) #define _PORTABLESERVER__TAO_SEQ_POLICY___OUT_CH_ -class TAO_Export _tao_seq_Policy_out -{ -public: -_tao_seq_Policy_out (_tao_seq_Policy *&); -_tao_seq_Policy_out (_tao_seq_Policy_var &); -_tao_seq_Policy_out (_tao_seq_Policy_out &); -_tao_seq_Policy_out &operator= (_tao_seq_Policy_out &); -_tao_seq_Policy_out &operator= (_tao_seq_Policy *); -operator _tao_seq_Policy *&(); -_tao_seq_Policy *&ptr (void); -_tao_seq_Policy *operator-> (void); -ACE_NESTED_CLASS (PortableServer,_tao_seq_Policy::TAO_ObjRefMngType) operator[] (CORBA::ULong index); - -private: -_tao_seq_Policy *&ptr_; -// assignment from T_var not allowed -void operator= (const _tao_seq_Policy_var &); -}; + class TAO_Export _tao_seq_Policy_out + { + public: + _tao_seq_Policy_out (_tao_seq_Policy *&); + _tao_seq_Policy_out (_tao_seq_Policy_var &); + _tao_seq_Policy_out (_tao_seq_Policy_out &); + _tao_seq_Policy_out &operator= (_tao_seq_Policy_out &); + _tao_seq_Policy_out &operator= (_tao_seq_Policy *); + operator _tao_seq_Policy *&(); + _tao_seq_Policy *&ptr (void); + _tao_seq_Policy *operator-> (void); + TAO_Object_Manager operator[] (CORBA::ULong index); + + private: + _tao_seq_Policy *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_Policy_var &); + }; #endif // end #if !defined -typedef _tao_seq_Policy PolicyList; -typedef _tao_seq_Policy_var PolicyList_var; -typedef _tao_seq_Policy_out PolicyList_out; + typedef _tao_seq_Policy PolicyList; + typedef _tao_seq_Policy_var PolicyList_var; + typedef _tao_seq_Policy_out PolicyList_out; -static CORBA::TypeCode_ptr _tc_PolicyList; - -class POA; + static CORBA::TypeCode_ptr _tc_PolicyList; + class POA; + #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ @@ -367,30 +326,30 @@ typedef POA *POA_ptr; #if !defined (_PORTABLESERVER_POA___VAR_CH_) #define _PORTABLESERVER_POA___VAR_CH_ -class TAO_Export POA_var -{ -public: -POA_var (void); // default constructor -POA_var (POA_ptr); -POA_var (const POA_var &); // copy constructor -~POA_var (void); // destructor - -POA_var &operator= (POA_ptr); -POA_var &operator= (const POA_var &); -POA_ptr operator-> (void) const; - -operator const POA_ptr &() const; -operator POA_ptr &(); -// in, inout, out, _retn -POA_ptr in (void) const; -POA_ptr &inout (void); -POA_ptr &out (void); -POA_ptr _retn (void); -POA_ptr ptr (void) const; - -private: -POA_ptr ptr_; -}; + class TAO_Export POA_var + { + public: + POA_var (void); // default constructor + POA_var (POA_ptr); + POA_var (const POA_var &); // copy constructor + ~POA_var (void); // destructor + + POA_var &operator= (POA_ptr); + POA_var &operator= (const POA_var &); + POA_ptr operator-> (void) const; + + operator const POA_ptr &() const; + operator POA_ptr &(); + // in, inout, out, _retn + POA_ptr in (void) const; + POA_ptr &inout (void); + POA_ptr &out (void); + POA_ptr _retn (void); + POA_ptr ptr (void) const; + + private: + POA_ptr ptr_; + }; #endif // end #if !defined @@ -399,22 +358,22 @@ POA_ptr ptr_; #if !defined (_PORTABLESERVER_POA___OUT_CH_) #define _PORTABLESERVER_POA___OUT_CH_ -class TAO_Export POA_out -{ -public: -POA_out (POA_ptr &); -POA_out (POA_var &); -POA_out (POA_out &); -POA_out &operator= (POA_out &); -POA_out &operator= (const POA_var &); -POA_out &operator= (POA_ptr); -operator POA_ptr &(); -POA_ptr &ptr (void); -POA_ptr operator-> (void); - -private: -POA_ptr &ptr_; -}; + class TAO_Export POA_out + { + public: + POA_out (POA_ptr &); + POA_out (POA_var &); + POA_out (POA_out &); + POA_out &operator= (POA_out &); + POA_out &operator= (const POA_var &); + POA_out &operator= (POA_ptr); + operator POA_ptr &(); + POA_ptr &ptr (void); + POA_ptr operator-> (void); + + private: + POA_ptr &ptr_; + }; #endif // end #if !defined @@ -423,35 +382,13 @@ POA_ptr &ptr_; #if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CH_) #define _PORTABLESERVER__TAO_SEQ_OCTET_CH_ -// ************************************************************* -// class _tao_seq_Octet -// ************************************************************* - -class TAO_Export _tao_seq_Octet -{ -public: -_tao_seq_Octet (void); // default constructor -_tao_seq_Octet (CORBA::ULong max); -_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, - CORBA::Octet *value, CORBA::Boolean release=CORBA::B_FALSE); -_tao_seq_Octet(const _tao_seq_Octet &); // copy constructor -~_tao_seq_Octet (void); -_tao_seq_Octet &operator= (const _tao_seq_Octet &); -CORBA::ULong maximum (void) const; -void length (CORBA::ULong); -CORBA::ULong length (void) const; -CORBA::Octet &operator[] (CORBA::ULong index); -const CORBA::Octet &operator[] (CORBA::ULong index) const; -static CORBA::Octet *allocbuf (CORBA::ULong nelems); -static void freebuf (CORBA::Octet *); -private: -CORBA::ULong maximum_; -CORBA::ULong length_; -CORBA::Octet *buffer_; -CORBA::Boolean release_; -}; -typedef _tao_seq_Octet* _tao_seq_Octet_ptr; -static CORBA::TypeCode_ptr _tc__tao_seq_Octet; + // ************************************************************* + // _tao_seq_Octet + // ************************************************************* + + typedef TAO_Unbounded_Sequence _tao_seq_Octet; + typedef _tao_seq_Octet* _tao_seq_Octet_ptr; + static CORBA::TypeCode_ptr _tc__tao_seq_Octet; #endif // end #if !defined @@ -461,36 +398,36 @@ static CORBA::TypeCode_ptr _tc__tao_seq_Octet; #define _PORTABLESERVER__TAO_SEQ_OCTET___VAR_CH_ // ************************************************************* -// class PortableServer::_tao_seq_Octet_var -// ************************************************************* + // class PortableServer::_tao_seq_Octet_var + // ************************************************************* -class TAO_Export _tao_seq_Octet_var -{ -public: -_tao_seq_Octet_var (void); // default constructor -_tao_seq_Octet_var (_tao_seq_Octet *); -_tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor -~_tao_seq_Octet_var (void); // destructor - -_tao_seq_Octet_var &operator= (_tao_seq_Octet *); -_tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); -_tao_seq_Octet *operator-> (void); -const _tao_seq_Octet *operator-> (void) const; - -operator const _tao_seq_Octet &() const; -operator _tao_seq_Octet &(); -operator _tao_seq_Octet &() const; -CORBA::Octet &operator[] (CORBA::ULong index); -// in, inout, out, _retn -const _tao_seq_Octet &in (void) const; -_tao_seq_Octet &inout (void); -_tao_seq_Octet *&out (void); -_tao_seq_Octet *_retn (void); -_tao_seq_Octet *ptr (void) const; - -private: -_tao_seq_Octet *ptr_; -}; + class TAO_Export _tao_seq_Octet_var + { + public: + _tao_seq_Octet_var (void); // default constructor + _tao_seq_Octet_var (_tao_seq_Octet *); + _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor + ~_tao_seq_Octet_var (void); // destructor + + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); + _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); + _tao_seq_Octet *operator-> (void); + const _tao_seq_Octet *operator-> (void) const; + + operator const _tao_seq_Octet &() const; + operator _tao_seq_Octet &(); + operator _tao_seq_Octet &() const; + CORBA::Octet &operator[] (CORBA::ULong index); + // in, inout, out, _retn + const _tao_seq_Octet &in (void) const; + _tao_seq_Octet &inout (void); + _tao_seq_Octet *&out (void); + _tao_seq_Octet *_retn (void); + _tao_seq_Octet *ptr (void) const; + + private: + _tao_seq_Octet *ptr_; + }; #endif // end #if !defined @@ -499,108 +436,108 @@ _tao_seq_Octet *ptr_; #if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___OUT_CH_) #define _PORTABLESERVER__TAO_SEQ_OCTET___OUT_CH_ -class TAO_Export _tao_seq_Octet_out -{ -public: -_tao_seq_Octet_out (_tao_seq_Octet *&); -_tao_seq_Octet_out (_tao_seq_Octet_var &); -_tao_seq_Octet_out (_tao_seq_Octet_out &); -_tao_seq_Octet_out &operator= (_tao_seq_Octet_out &); -_tao_seq_Octet_out &operator= (_tao_seq_Octet *); -operator _tao_seq_Octet *&(); -_tao_seq_Octet *&ptr (void); -_tao_seq_Octet *operator-> (void); -CORBA::Octet &operator[] (CORBA::ULong index); - -private: -_tao_seq_Octet *&ptr_; -// assignment from T_var not allowed -void operator= (const _tao_seq_Octet_var &); -}; + class TAO_Export _tao_seq_Octet_out + { + public: + _tao_seq_Octet_out (_tao_seq_Octet *&); + _tao_seq_Octet_out (_tao_seq_Octet_var &); + _tao_seq_Octet_out (_tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (_tao_seq_Octet_out &); + _tao_seq_Octet_out &operator= (_tao_seq_Octet *); + operator _tao_seq_Octet *&(); + _tao_seq_Octet *&ptr (void); + _tao_seq_Octet *operator-> (void); + CORBA::Octet &operator[] (CORBA::ULong index); + + private: + _tao_seq_Octet *&ptr_; + // assignment from T_var not allowed + void operator= (const _tao_seq_Octet_var &); + }; #endif // end #if !defined -typedef _tao_seq_Octet ObjectId; -typedef _tao_seq_Octet_var ObjectId_var; -typedef _tao_seq_Octet_out ObjectId_out; - -static CORBA::TypeCode_ptr _tc_ObjectId; + typedef _tao_seq_Octet ObjectId; + typedef _tao_seq_Octet_var ObjectId_var; + typedef _tao_seq_Octet_out ObjectId_out; + static CORBA::TypeCode_ptr _tc_ObjectId; + #if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_) #define _PORTABLESERVER_FORWARDREQUEST___PTR_CH_ -class ForwardRequest; -typedef ForwardRequest *ForwardRequest_ptr; - + class ForwardRequest; + typedef ForwardRequest *ForwardRequest_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_) #define _PORTABLESERVER_FORWARDREQUEST_CH_ -class TAO_Export ForwardRequest : public CORBA::UserException -{ -public: -ForwardRequest (void); // default ctor -ForwardRequest (const ForwardRequest &); // copy ctor -~ForwardRequest(void); // dtor -ForwardRequest(const CORBA::Object_ptr&); -ForwardRequest &operator= (const ForwardRequest &); -static ForwardRequest *_narrow (CORBA::Exception *); -CORBA::Object_var forward_reference; -}; -static CORBA::TypeCode_ptr _tc_ForwardRequest; + class TAO_Export ForwardRequest : public CORBA::UserException + { + public: + ForwardRequest (void); // default ctor + ForwardRequest (const ForwardRequest &); // copy ctor + ~ForwardRequest(void); // dtor + ForwardRequest(const CORBA::Object_ptr&); + ForwardRequest &operator= (const ForwardRequest &); + static ForwardRequest *_narrow (CORBA::Exception *); + CORBA::Object_var forward_reference; + }; + static CORBA::TypeCode_ptr _tc_ForwardRequest; #endif // end #if !defined -enum ThreadPolicyValue -{ -ORB_CTRL_MODEL, -SINGLE_THREAD_MODEL -}; -typedef ThreadPolicyValue &ThreadPolicyValue_out; -static CORBA::TypeCode_ptr _tc_ThreadPolicyValue; - + enum ThreadPolicyValue + { + ORB_CTRL_MODEL, + SINGLE_THREAD_MODEL + }; + typedef ThreadPolicyValue &ThreadPolicyValue_out; + static CORBA::TypeCode_ptr _tc_ThreadPolicyValue; + #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_) #define _PORTABLESERVER_THREADPOLICY___PTR_CH_ class ThreadPolicy; -typedef ThreadPolicy *ThreadPolicy_ptr; - + typedef ThreadPolicy *ThreadPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_) #define _PORTABLESERVER_THREADPOLICY___VAR_CH_ -class TAO_Export ThreadPolicy_var -{ -public: -ThreadPolicy_var (void); // default constructor -ThreadPolicy_var (ThreadPolicy_ptr); -ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor -~ThreadPolicy_var (void); // destructor - -ThreadPolicy_var &operator= (ThreadPolicy_ptr); -ThreadPolicy_var &operator= (const ThreadPolicy_var &); -ThreadPolicy_ptr operator-> (void) const; - -operator const ThreadPolicy_ptr &() const; -operator ThreadPolicy_ptr &(); -// in, inout, out, _retn -ThreadPolicy_ptr in (void) const; -ThreadPolicy_ptr &inout (void); -ThreadPolicy_ptr &out (void); -ThreadPolicy_ptr _retn (void); -ThreadPolicy_ptr ptr (void) const; - -private: -ThreadPolicy_ptr ptr_; -}; + class TAO_Export ThreadPolicy_var + { + public: + ThreadPolicy_var (void); // default constructor + ThreadPolicy_var (ThreadPolicy_ptr); + ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor + ~ThreadPolicy_var (void); // destructor + + ThreadPolicy_var &operator= (ThreadPolicy_ptr); + ThreadPolicy_var &operator= (const ThreadPolicy_var &); + ThreadPolicy_ptr operator-> (void) const; + + operator const ThreadPolicy_ptr &() const; + operator ThreadPolicy_ptr &(); + // in, inout, out, _retn + ThreadPolicy_ptr in (void) const; + ThreadPolicy_ptr &inout (void); + ThreadPolicy_ptr &out (void); + ThreadPolicy_ptr _retn (void); + ThreadPolicy_ptr ptr (void) const; + + private: + ThreadPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -609,22 +546,22 @@ ThreadPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_) #define _PORTABLESERVER_THREADPOLICY___OUT_CH_ -class TAO_Export ThreadPolicy_out -{ -public: -ThreadPolicy_out (ThreadPolicy_ptr &); -ThreadPolicy_out (ThreadPolicy_var &); -ThreadPolicy_out (ThreadPolicy_out &); -ThreadPolicy_out &operator= (ThreadPolicy_out &); -ThreadPolicy_out &operator= (const ThreadPolicy_var &); -ThreadPolicy_out &operator= (ThreadPolicy_ptr); -operator ThreadPolicy_ptr &(); -ThreadPolicy_ptr &ptr (void); -ThreadPolicy_ptr operator-> (void); - -private: -ThreadPolicy_ptr &ptr_; -}; + class TAO_Export ThreadPolicy_out + { + public: + ThreadPolicy_out (ThreadPolicy_ptr &); + ThreadPolicy_out (ThreadPolicy_var &); + ThreadPolicy_out (ThreadPolicy_out &); + ThreadPolicy_out &operator= (ThreadPolicy_out &); + ThreadPolicy_out &operator= (const ThreadPolicy_var &); + ThreadPolicy_out &operator= (ThreadPolicy_ptr); + operator ThreadPolicy_ptr &(); + ThreadPolicy_ptr &ptr (void); + ThreadPolicy_ptr operator-> (void); + + private: + ThreadPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -633,77 +570,80 @@ ThreadPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_THREADPOLICY_CH_) #define _PORTABLESERVER_THREADPOLICY_CH_ -class TAO_Export ThreadPolicy: public virtual Policy -{ -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 _nil (void); -static ThreadPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual ThreadPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -ThreadPolicy (void); // default constructor -ThreadPolicy (STUB_Object *objref); -public: -virtual ~ThreadPolicy (void); -private: -ThreadPolicy (const ThreadPolicy&); -void operator= (const ThreadPolicy&); -}; + class TAO_Export ThreadPolicy: public virtual Policy + { + 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 _nil (void); + static ThreadPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual ThreadPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + ThreadPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~ThreadPolicy (void); + private: + ThreadPolicy (const ThreadPolicy&); + void operator= (const ThreadPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_ThreadPolicy; - -enum LifespanPolicyValue -{ -TRANSIENT, -PERSISTENT -}; -typedef LifespanPolicyValue &LifespanPolicyValue_out; -static CORBA::TypeCode_ptr _tc_LifespanPolicyValue; + static CORBA::TypeCode_ptr _tc_ThreadPolicy; + enum LifespanPolicyValue + { + TRANSIENT, + PERSISTENT + }; + typedef LifespanPolicyValue &LifespanPolicyValue_out; + static CORBA::TypeCode_ptr _tc_LifespanPolicyValue; + #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_) #define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_ class LifespanPolicy; -typedef LifespanPolicy *LifespanPolicy_ptr; - + typedef LifespanPolicy *LifespanPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_) #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_ -class TAO_Export LifespanPolicy_var -{ -public: -LifespanPolicy_var (void); // default constructor -LifespanPolicy_var (LifespanPolicy_ptr); -LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor -~LifespanPolicy_var (void); // destructor - -LifespanPolicy_var &operator= (LifespanPolicy_ptr); -LifespanPolicy_var &operator= (const LifespanPolicy_var &); -LifespanPolicy_ptr operator-> (void) const; - -operator const LifespanPolicy_ptr &() const; -operator LifespanPolicy_ptr &(); -// in, inout, out, _retn -LifespanPolicy_ptr in (void) const; -LifespanPolicy_ptr &inout (void); -LifespanPolicy_ptr &out (void); -LifespanPolicy_ptr _retn (void); -LifespanPolicy_ptr ptr (void) const; - -private: -LifespanPolicy_ptr ptr_; -}; + class TAO_Export LifespanPolicy_var + { + public: + LifespanPolicy_var (void); // default constructor + LifespanPolicy_var (LifespanPolicy_ptr); + LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor + ~LifespanPolicy_var (void); // destructor + + LifespanPolicy_var &operator= (LifespanPolicy_ptr); + LifespanPolicy_var &operator= (const LifespanPolicy_var &); + LifespanPolicy_ptr operator-> (void) const; + + operator const LifespanPolicy_ptr &() const; + operator LifespanPolicy_ptr &(); + // in, inout, out, _retn + LifespanPolicy_ptr in (void) const; + LifespanPolicy_ptr &inout (void); + LifespanPolicy_ptr &out (void); + LifespanPolicy_ptr _retn (void); + LifespanPolicy_ptr ptr (void) const; + + private: + LifespanPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -712,22 +652,22 @@ LifespanPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_) #define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_ -class TAO_Export LifespanPolicy_out -{ -public: -LifespanPolicy_out (LifespanPolicy_ptr &); -LifespanPolicy_out (LifespanPolicy_var &); -LifespanPolicy_out (LifespanPolicy_out &); -LifespanPolicy_out &operator= (LifespanPolicy_out &); -LifespanPolicy_out &operator= (const LifespanPolicy_var &); -LifespanPolicy_out &operator= (LifespanPolicy_ptr); -operator LifespanPolicy_ptr &(); -LifespanPolicy_ptr &ptr (void); -LifespanPolicy_ptr operator-> (void); - -private: -LifespanPolicy_ptr &ptr_; -}; + class TAO_Export LifespanPolicy_out + { + public: + LifespanPolicy_out (LifespanPolicy_ptr &); + LifespanPolicy_out (LifespanPolicy_var &); + LifespanPolicy_out (LifespanPolicy_out &); + LifespanPolicy_out &operator= (LifespanPolicy_out &); + LifespanPolicy_out &operator= (const LifespanPolicy_var &); + LifespanPolicy_out &operator= (LifespanPolicy_ptr); + operator LifespanPolicy_ptr &(); + LifespanPolicy_ptr &ptr (void); + LifespanPolicy_ptr operator-> (void); + + private: + LifespanPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -736,77 +676,80 @@ LifespanPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_) #define _PORTABLESERVER_LIFESPANPOLICY_CH_ -class TAO_Export LifespanPolicy: public virtual Policy -{ -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 _nil (void); -static LifespanPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual LifespanPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -LifespanPolicy (void); // default constructor -LifespanPolicy (STUB_Object *objref); -public: -virtual ~LifespanPolicy (void); -private: -LifespanPolicy (const LifespanPolicy&); -void operator= (const LifespanPolicy&); -}; + class TAO_Export LifespanPolicy: public virtual Policy + { + 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 _nil (void); + static LifespanPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual LifespanPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + LifespanPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~LifespanPolicy (void); + private: + LifespanPolicy (const LifespanPolicy&); + void operator= (const LifespanPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_LifespanPolicy; - -enum IdUniquenessPolicyValue -{ -UNIQUE_ID, -MULTIPLE_ID -}; -typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out; -static CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; + static CORBA::TypeCode_ptr _tc_LifespanPolicy; + enum IdUniquenessPolicyValue + { + UNIQUE_ID, + MULTIPLE_ID + }; + typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out; + static CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; + #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_ class IdUniquenessPolicy; -typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr; - + typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_ -class TAO_Export IdUniquenessPolicy_var -{ -public: -IdUniquenessPolicy_var (void); // default constructor -IdUniquenessPolicy_var (IdUniquenessPolicy_ptr); -IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor -~IdUniquenessPolicy_var (void); // destructor - -IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr); -IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &); -IdUniquenessPolicy_ptr operator-> (void) const; - -operator const IdUniquenessPolicy_ptr &() const; -operator IdUniquenessPolicy_ptr &(); -// in, inout, out, _retn -IdUniquenessPolicy_ptr in (void) const; -IdUniquenessPolicy_ptr &inout (void); -IdUniquenessPolicy_ptr &out (void); -IdUniquenessPolicy_ptr _retn (void); -IdUniquenessPolicy_ptr ptr (void) const; - -private: -IdUniquenessPolicy_ptr ptr_; -}; + class TAO_Export IdUniquenessPolicy_var + { + public: + IdUniquenessPolicy_var (void); // default constructor + IdUniquenessPolicy_var (IdUniquenessPolicy_ptr); + IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor + ~IdUniquenessPolicy_var (void); // destructor + + IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr); + IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &); + IdUniquenessPolicy_ptr operator-> (void) const; + + operator const IdUniquenessPolicy_ptr &() const; + operator IdUniquenessPolicy_ptr &(); + // in, inout, out, _retn + IdUniquenessPolicy_ptr in (void) const; + IdUniquenessPolicy_ptr &inout (void); + IdUniquenessPolicy_ptr &out (void); + IdUniquenessPolicy_ptr _retn (void); + IdUniquenessPolicy_ptr ptr (void) const; + + private: + IdUniquenessPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -815,22 +758,22 @@ IdUniquenessPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_ -class TAO_Export IdUniquenessPolicy_out -{ -public: -IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &); -IdUniquenessPolicy_out (IdUniquenessPolicy_var &); -IdUniquenessPolicy_out (IdUniquenessPolicy_out &); -IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_out &); -IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &); -IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr); -operator IdUniquenessPolicy_ptr &(); -IdUniquenessPolicy_ptr &ptr (void); -IdUniquenessPolicy_ptr operator-> (void); - -private: -IdUniquenessPolicy_ptr &ptr_; -}; + class TAO_Export IdUniquenessPolicy_out + { + public: + IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &); + IdUniquenessPolicy_out (IdUniquenessPolicy_var &); + IdUniquenessPolicy_out (IdUniquenessPolicy_out &); + IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_out &); + IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &); + IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr); + operator IdUniquenessPolicy_ptr &(); + IdUniquenessPolicy_ptr &ptr (void); + IdUniquenessPolicy_ptr operator-> (void); + + private: + IdUniquenessPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -839,77 +782,80 @@ IdUniquenessPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_ -class TAO_Export IdUniquenessPolicy: public virtual Policy -{ -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 _nil (void); -static IdUniquenessPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual IdUniquenessPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -IdUniquenessPolicy (void); // default constructor -IdUniquenessPolicy (STUB_Object *objref); -public: -virtual ~IdUniquenessPolicy (void); -private: -IdUniquenessPolicy (const IdUniquenessPolicy&); -void operator= (const IdUniquenessPolicy&); -}; + class TAO_Export IdUniquenessPolicy: public virtual Policy + { + 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 _nil (void); + static IdUniquenessPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual IdUniquenessPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + IdUniquenessPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~IdUniquenessPolicy (void); + private: + IdUniquenessPolicy (const IdUniquenessPolicy&); + void operator= (const IdUniquenessPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_IdUniquenessPolicy; - -enum IdAssignmentPolicyValue -{ -USER_ID, -SYSTEM_ID -}; -typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out; -static CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; + static CORBA::TypeCode_ptr _tc_IdUniquenessPolicy; + enum IdAssignmentPolicyValue + { + USER_ID, + SYSTEM_ID + }; + typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out; + static CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; + #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_ class IdAssignmentPolicy; -typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr; - + typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_ -class TAO_Export IdAssignmentPolicy_var -{ -public: -IdAssignmentPolicy_var (void); // default constructor -IdAssignmentPolicy_var (IdAssignmentPolicy_ptr); -IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor -~IdAssignmentPolicy_var (void); // destructor - -IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr); -IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &); -IdAssignmentPolicy_ptr operator-> (void) const; - -operator const IdAssignmentPolicy_ptr &() const; -operator IdAssignmentPolicy_ptr &(); -// in, inout, out, _retn -IdAssignmentPolicy_ptr in (void) const; -IdAssignmentPolicy_ptr &inout (void); -IdAssignmentPolicy_ptr &out (void); -IdAssignmentPolicy_ptr _retn (void); -IdAssignmentPolicy_ptr ptr (void) const; - -private: -IdAssignmentPolicy_ptr ptr_; -}; + class TAO_Export IdAssignmentPolicy_var + { + public: + IdAssignmentPolicy_var (void); // default constructor + IdAssignmentPolicy_var (IdAssignmentPolicy_ptr); + IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor + ~IdAssignmentPolicy_var (void); // destructor + + IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr); + IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &); + IdAssignmentPolicy_ptr operator-> (void) const; + + operator const IdAssignmentPolicy_ptr &() const; + operator IdAssignmentPolicy_ptr &(); + // in, inout, out, _retn + IdAssignmentPolicy_ptr in (void) const; + IdAssignmentPolicy_ptr &inout (void); + IdAssignmentPolicy_ptr &out (void); + IdAssignmentPolicy_ptr _retn (void); + IdAssignmentPolicy_ptr ptr (void) const; + + private: + IdAssignmentPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -918,22 +864,22 @@ IdAssignmentPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_ -class TAO_Export IdAssignmentPolicy_out -{ -public: -IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &); -IdAssignmentPolicy_out (IdAssignmentPolicy_var &); -IdAssignmentPolicy_out (IdAssignmentPolicy_out &); -IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_out &); -IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &); -IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr); -operator IdAssignmentPolicy_ptr &(); -IdAssignmentPolicy_ptr &ptr (void); -IdAssignmentPolicy_ptr operator-> (void); - -private: -IdAssignmentPolicy_ptr &ptr_; -}; + class TAO_Export IdAssignmentPolicy_out + { + public: + IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &); + IdAssignmentPolicy_out (IdAssignmentPolicy_var &); + IdAssignmentPolicy_out (IdAssignmentPolicy_out &); + IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_out &); + IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &); + IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr); + operator IdAssignmentPolicy_ptr &(); + IdAssignmentPolicy_ptr &ptr (void); + IdAssignmentPolicy_ptr operator-> (void); + + private: + IdAssignmentPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -942,77 +888,80 @@ IdAssignmentPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_ -class TAO_Export IdAssignmentPolicy: public virtual Policy -{ -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 _nil (void); -static IdAssignmentPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual IdAssignmentPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -IdAssignmentPolicy (void); // default constructor -IdAssignmentPolicy (STUB_Object *objref); -public: -virtual ~IdAssignmentPolicy (void); -private: -IdAssignmentPolicy (const IdAssignmentPolicy&); -void operator= (const IdAssignmentPolicy&); -}; + class TAO_Export IdAssignmentPolicy: public virtual Policy + { + 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 _nil (void); + static IdAssignmentPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual IdAssignmentPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + IdAssignmentPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~IdAssignmentPolicy (void); + private: + IdAssignmentPolicy (const IdAssignmentPolicy&); + void operator= (const IdAssignmentPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_IdAssignmentPolicy; - -enum ImplicitActivationPolicyValue -{ -IMPLICIT_ACTIVATION, -NO_IMPLICIT_ACTIVATION -}; -typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; -static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; + static CORBA::TypeCode_ptr _tc_IdAssignmentPolicy; + enum ImplicitActivationPolicyValue + { + IMPLICIT_ACTIVATION, + NO_IMPLICIT_ACTIVATION + }; + typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; + static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; + #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_ class ImplicitActivationPolicy; -typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr; - + typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_ -class TAO_Export ImplicitActivationPolicy_var -{ -public: -ImplicitActivationPolicy_var (void); // default constructor -ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr); -ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor -~ImplicitActivationPolicy_var (void); // destructor - -ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr); -ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &); -ImplicitActivationPolicy_ptr operator-> (void) const; - -operator const ImplicitActivationPolicy_ptr &() const; -operator ImplicitActivationPolicy_ptr &(); -// in, inout, out, _retn -ImplicitActivationPolicy_ptr in (void) const; -ImplicitActivationPolicy_ptr &inout (void); -ImplicitActivationPolicy_ptr &out (void); -ImplicitActivationPolicy_ptr _retn (void); -ImplicitActivationPolicy_ptr ptr (void) const; - -private: -ImplicitActivationPolicy_ptr ptr_; -}; + class TAO_Export ImplicitActivationPolicy_var + { + public: + ImplicitActivationPolicy_var (void); // default constructor + ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr); + ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor + ~ImplicitActivationPolicy_var (void); // destructor + + ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr); + ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &); + ImplicitActivationPolicy_ptr operator-> (void) const; + + operator const ImplicitActivationPolicy_ptr &() const; + operator ImplicitActivationPolicy_ptr &(); + // in, inout, out, _retn + ImplicitActivationPolicy_ptr in (void) const; + ImplicitActivationPolicy_ptr &inout (void); + ImplicitActivationPolicy_ptr &out (void); + ImplicitActivationPolicy_ptr _retn (void); + ImplicitActivationPolicy_ptr ptr (void) const; + + private: + ImplicitActivationPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -1021,22 +970,22 @@ ImplicitActivationPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_ -class TAO_Export ImplicitActivationPolicy_out -{ -public: -ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &); -ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &); -ImplicitActivationPolicy_out (ImplicitActivationPolicy_out &); -ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_out &); -ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &); -ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr); -operator ImplicitActivationPolicy_ptr &(); -ImplicitActivationPolicy_ptr &ptr (void); -ImplicitActivationPolicy_ptr operator-> (void); - -private: -ImplicitActivationPolicy_ptr &ptr_; -}; + class TAO_Export ImplicitActivationPolicy_out + { + public: + ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &); + ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &); + ImplicitActivationPolicy_out (ImplicitActivationPolicy_out &); + ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_out &); + ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &); + ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr); + operator ImplicitActivationPolicy_ptr &(); + ImplicitActivationPolicy_ptr &ptr (void); + ImplicitActivationPolicy_ptr operator-> (void); + + private: + ImplicitActivationPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -1045,77 +994,80 @@ ImplicitActivationPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_ -class TAO_Export ImplicitActivationPolicy: public virtual Policy -{ -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 _nil (void); -static ImplicitActivationPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual ImplicitActivationPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -ImplicitActivationPolicy (void); // default constructor -ImplicitActivationPolicy (STUB_Object *objref); -public: -virtual ~ImplicitActivationPolicy (void); -private: -ImplicitActivationPolicy (const ImplicitActivationPolicy&); -void operator= (const ImplicitActivationPolicy&); -}; + class TAO_Export ImplicitActivationPolicy: public virtual Policy + { + 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 _nil (void); + static ImplicitActivationPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual ImplicitActivationPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + ImplicitActivationPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~ImplicitActivationPolicy (void); + private: + ImplicitActivationPolicy (const ImplicitActivationPolicy&); + void operator= (const ImplicitActivationPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy; - -enum ServantRetentionPolicyValue -{ -RETAIN, -NON_RETAIN -}; -typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; -static CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; + static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy; + enum ServantRetentionPolicyValue + { + RETAIN, + NON_RETAIN + }; + typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; + static CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; + #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_ class ServantRetentionPolicy; -typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr; - + typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_ -class TAO_Export ServantRetentionPolicy_var -{ -public: -ServantRetentionPolicy_var (void); // default constructor -ServantRetentionPolicy_var (ServantRetentionPolicy_ptr); -ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor -~ServantRetentionPolicy_var (void); // destructor - -ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr); -ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &); -ServantRetentionPolicy_ptr operator-> (void) const; - -operator const ServantRetentionPolicy_ptr &() const; -operator ServantRetentionPolicy_ptr &(); -// in, inout, out, _retn -ServantRetentionPolicy_ptr in (void) const; -ServantRetentionPolicy_ptr &inout (void); -ServantRetentionPolicy_ptr &out (void); -ServantRetentionPolicy_ptr _retn (void); -ServantRetentionPolicy_ptr ptr (void) const; - -private: -ServantRetentionPolicy_ptr ptr_; -}; + class TAO_Export ServantRetentionPolicy_var + { + public: + ServantRetentionPolicy_var (void); // default constructor + ServantRetentionPolicy_var (ServantRetentionPolicy_ptr); + ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor + ~ServantRetentionPolicy_var (void); // destructor + + ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr); + ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &); + ServantRetentionPolicy_ptr operator-> (void) const; + + operator const ServantRetentionPolicy_ptr &() const; + operator ServantRetentionPolicy_ptr &(); + // in, inout, out, _retn + ServantRetentionPolicy_ptr in (void) const; + ServantRetentionPolicy_ptr &inout (void); + ServantRetentionPolicy_ptr &out (void); + ServantRetentionPolicy_ptr _retn (void); + ServantRetentionPolicy_ptr ptr (void) const; + + private: + ServantRetentionPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -1124,22 +1076,22 @@ ServantRetentionPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_ -class TAO_Export ServantRetentionPolicy_out -{ -public: -ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &); -ServantRetentionPolicy_out (ServantRetentionPolicy_var &); -ServantRetentionPolicy_out (ServantRetentionPolicy_out &); -ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_out &); -ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &); -ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr); -operator ServantRetentionPolicy_ptr &(); -ServantRetentionPolicy_ptr &ptr (void); -ServantRetentionPolicy_ptr operator-> (void); - -private: -ServantRetentionPolicy_ptr &ptr_; -}; + class TAO_Export ServantRetentionPolicy_out + { + public: + ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &); + ServantRetentionPolicy_out (ServantRetentionPolicy_var &); + ServantRetentionPolicy_out (ServantRetentionPolicy_out &); + ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_out &); + ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &); + ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr); + operator ServantRetentionPolicy_ptr &(); + ServantRetentionPolicy_ptr &ptr (void); + ServantRetentionPolicy_ptr operator-> (void); + + private: + ServantRetentionPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -1148,78 +1100,81 @@ ServantRetentionPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_ -class TAO_Export ServantRetentionPolicy: public virtual Policy -{ -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 _nil (void); -static ServantRetentionPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual ServantRetentionPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -ServantRetentionPolicy (void); // default constructor -ServantRetentionPolicy (STUB_Object *objref); -public: -virtual ~ServantRetentionPolicy (void); -private: -ServantRetentionPolicy (const ServantRetentionPolicy&); -void operator= (const ServantRetentionPolicy&); -}; + class TAO_Export ServantRetentionPolicy: public virtual Policy + { + 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 _nil (void); + static ServantRetentionPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual ServantRetentionPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + ServantRetentionPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~ServantRetentionPolicy (void); + private: + ServantRetentionPolicy (const ServantRetentionPolicy&); + void operator= (const ServantRetentionPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_ServantRetentionPolicy; - -enum RequestProcessingPolicyValue -{ -USE_ACTIVE_OBJECT_MAP_ONLY, -USE_DEFAULT_SERVANT, -USE_SERVANT_MANAGER -}; -typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; -static CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; + static CORBA::TypeCode_ptr _tc_ServantRetentionPolicy; + enum RequestProcessingPolicyValue + { + USE_ACTIVE_OBJECT_MAP_ONLY, + USE_DEFAULT_SERVANT, + USE_SERVANT_MANAGER + }; + typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; + static CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; + #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_ -class TAO_Export RequestProcessingPolicy; -typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr; - +class RequestProcessingPolicy; + typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_ -class TAO_Export RequestProcessingPolicy_var -{ -public: -RequestProcessingPolicy_var (void); // default constructor -RequestProcessingPolicy_var (RequestProcessingPolicy_ptr); -RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor -~RequestProcessingPolicy_var (void); // destructor - -RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr); -RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &); -RequestProcessingPolicy_ptr operator-> (void) const; - -operator const RequestProcessingPolicy_ptr &() const; -operator RequestProcessingPolicy_ptr &(); -// in, inout, out, _retn -RequestProcessingPolicy_ptr in (void) const; -RequestProcessingPolicy_ptr &inout (void); -RequestProcessingPolicy_ptr &out (void); -RequestProcessingPolicy_ptr _retn (void); -RequestProcessingPolicy_ptr ptr (void) const; - -private: -RequestProcessingPolicy_ptr ptr_; -}; + class TAO_Export RequestProcessingPolicy_var + { + public: + RequestProcessingPolicy_var (void); // default constructor + RequestProcessingPolicy_var (RequestProcessingPolicy_ptr); + RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor + ~RequestProcessingPolicy_var (void); // destructor + + RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr); + RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &); + RequestProcessingPolicy_ptr operator-> (void) const; + + operator const RequestProcessingPolicy_ptr &() const; + operator RequestProcessingPolicy_ptr &(); + // in, inout, out, _retn + RequestProcessingPolicy_ptr in (void) const; + RequestProcessingPolicy_ptr &inout (void); + RequestProcessingPolicy_ptr &out (void); + RequestProcessingPolicy_ptr _retn (void); + RequestProcessingPolicy_ptr ptr (void) const; + + private: + RequestProcessingPolicy_ptr ptr_; + }; #endif // end #if !defined @@ -1228,22 +1183,22 @@ RequestProcessingPolicy_ptr ptr_; #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_ -class TAO_Export RequestProcessingPolicy_out -{ -public: -RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &); -RequestProcessingPolicy_out (RequestProcessingPolicy_var &); -RequestProcessingPolicy_out (RequestProcessingPolicy_out &); -RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_out &); -RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &); -RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr); -operator RequestProcessingPolicy_ptr &(); -RequestProcessingPolicy_ptr &ptr (void); -RequestProcessingPolicy_ptr operator-> (void); - -private: -RequestProcessingPolicy_ptr &ptr_; -}; + class TAO_Export RequestProcessingPolicy_out + { + public: + RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &); + RequestProcessingPolicy_out (RequestProcessingPolicy_var &); + RequestProcessingPolicy_out (RequestProcessingPolicy_out &); + RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_out &); + RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &); + RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr); + operator RequestProcessingPolicy_ptr &(); + RequestProcessingPolicy_ptr &ptr (void); + RequestProcessingPolicy_ptr operator-> (void); + + private: + RequestProcessingPolicy_ptr &ptr_; + }; #endif // end #if !defined @@ -1252,69 +1207,72 @@ RequestProcessingPolicy_ptr &ptr_; #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_ -class TAO_Export RequestProcessingPolicy: public virtual Policy -{ -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 _nil (void); -static RequestProcessingPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual RequestProcessingPolicyValue value (CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -RequestProcessingPolicy (void); // default constructor -RequestProcessingPolicy (STUB_Object *objref); -public: -virtual ~RequestProcessingPolicy (void); -private: -RequestProcessingPolicy (const RequestProcessingPolicy&); -void operator= (const RequestProcessingPolicy&); -}; + class TAO_Export RequestProcessingPolicy: public virtual Policy + { + 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 _nil (void); + static RequestProcessingPolicy_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual RequestProcessingPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + RequestProcessingPolicy ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~RequestProcessingPolicy (void); + private: + RequestProcessingPolicy (const RequestProcessingPolicy&); + void operator= (const RequestProcessingPolicy&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; - + static CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; + #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_) #define _PORTABLESERVER_POAMANAGER___PTR_CH_ class POAManager; -typedef POAManager *POAManager_ptr; - + typedef POAManager *POAManager_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_) #define _PORTABLESERVER_POAMANAGER___VAR_CH_ -class TAO_Export POAManager_var -{ -public: -POAManager_var (void); // default constructor -POAManager_var (POAManager_ptr); -POAManager_var (const POAManager_var &); // copy constructor -~POAManager_var (void); // destructor - -POAManager_var &operator= (POAManager_ptr); -POAManager_var &operator= (const POAManager_var &); -POAManager_ptr operator-> (void) const; - -operator const POAManager_ptr &() const; -operator POAManager_ptr &(); -// in, inout, out, _retn -POAManager_ptr in (void) const; -POAManager_ptr &inout (void); -POAManager_ptr &out (void); -POAManager_ptr _retn (void); -POAManager_ptr ptr (void) const; - -private: -POAManager_ptr ptr_; -}; + class TAO_Export POAManager_var + { + public: + POAManager_var (void); // default constructor + POAManager_var (POAManager_ptr); + POAManager_var (const POAManager_var &); // copy constructor + ~POAManager_var (void); // destructor + + POAManager_var &operator= (POAManager_ptr); + POAManager_var &operator= (const POAManager_var &); + POAManager_ptr operator-> (void) const; + + operator const POAManager_ptr &() const; + operator POAManager_ptr &(); + // in, inout, out, _retn + POAManager_ptr in (void) const; + POAManager_ptr &inout (void); + POAManager_ptr &out (void); + POAManager_ptr _retn (void); + POAManager_ptr ptr (void) const; + + private: + POAManager_ptr ptr_; + }; #endif // end #if !defined @@ -1323,22 +1281,22 @@ POAManager_ptr ptr_; #if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_) #define _PORTABLESERVER_POAMANAGER___OUT_CH_ -class TAO_Export POAManager_out -{ -public: -POAManager_out (POAManager_ptr &); -POAManager_out (POAManager_var &); -POAManager_out (POAManager_out &); -POAManager_out &operator= (POAManager_out &); -POAManager_out &operator= (const POAManager_var &); -POAManager_out &operator= (POAManager_ptr); -operator POAManager_ptr &(); -POAManager_ptr &ptr (void); -POAManager_ptr operator-> (void); - -private: -POAManager_ptr &ptr_; -}; + class TAO_Export POAManager_out + { + public: + POAManager_out (POAManager_ptr &); + POAManager_out (POAManager_var &); + POAManager_out (POAManager_out &); + POAManager_out &operator= (POAManager_out &); + POAManager_out &operator= (const POAManager_var &); + POAManager_out &operator= (POAManager_ptr); + operator POAManager_ptr &(); + POAManager_ptr &ptr (void); + POAManager_ptr operator-> (void); + + private: + POAManager_ptr &ptr_; + }; #endif // end #if !defined @@ -1347,99 +1305,102 @@ POAManager_ptr &ptr_; #if !defined (_PORTABLESERVER_POAMANAGER_CH_) #define _PORTABLESERVER_POAMANAGER_CH_ -class TAO_Export POAManager: public virtual CORBA::Object -{ -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 _nil (void); -static POAManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - + class TAO_Export POAManager: public virtual CORBA::Object + { + 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 _nil (void); + static POAManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_) #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_ -class AdapterInactive; -typedef AdapterInactive *AdapterInactive_ptr; - + class AdapterInactive; + typedef AdapterInactive *AdapterInactive_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_) #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_ -class TAO_Export AdapterInactive : public CORBA::UserException -{ -public: -AdapterInactive (void); // default ctor -AdapterInactive (const AdapterInactive &); // copy ctor -~AdapterInactive(void); // dtor -AdapterInactive &operator= (const AdapterInactive &); -static AdapterInactive *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_AdapterInactive; + class TAO_Export AdapterInactive : public CORBA::UserException + { + public: + AdapterInactive (void); // default ctor + AdapterInactive (const AdapterInactive &); // copy ctor + ~AdapterInactive(void); // dtor + AdapterInactive &operator= (const AdapterInactive &); + static AdapterInactive *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_AdapterInactive; #endif // end #if !defined -virtual void activate (CORBA::Environment &env); -virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env); -virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env); -virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -POAManager (void); // default constructor -POAManager (STUB_Object *objref); -public: -virtual ~POAManager (void); -private: -POAManager (const POAManager&); -void operator= (const POAManager&); -}; + virtual void activate (CORBA::Environment &env); + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env); + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA::Environment &env); + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + POAManager ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~POAManager (void); + private: + POAManager (const POAManager&); + void operator= (const POAManager&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_POAManager; - + static CORBA::TypeCode_ptr _tc_POAManager; + #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_ class AdapterActivator; -typedef AdapterActivator *AdapterActivator_ptr; - + typedef AdapterActivator *AdapterActivator_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_ -class TAO_Export AdapterActivator_var -{ -public: -AdapterActivator_var (void); // default constructor -AdapterActivator_var (AdapterActivator_ptr); -AdapterActivator_var (const AdapterActivator_var &); // copy constructor -~AdapterActivator_var (void); // destructor - -AdapterActivator_var &operator= (AdapterActivator_ptr); -AdapterActivator_var &operator= (const AdapterActivator_var &); -AdapterActivator_ptr operator-> (void) const; - -operator const AdapterActivator_ptr &() const; -operator AdapterActivator_ptr &(); -// in, inout, out, _retn -AdapterActivator_ptr in (void) const; -AdapterActivator_ptr &inout (void); -AdapterActivator_ptr &out (void); -AdapterActivator_ptr _retn (void); -AdapterActivator_ptr ptr (void) const; - -private: -AdapterActivator_ptr ptr_; -}; + class TAO_Export AdapterActivator_var + { + public: + AdapterActivator_var (void); // default constructor + AdapterActivator_var (AdapterActivator_ptr); + AdapterActivator_var (const AdapterActivator_var &); // copy constructor + ~AdapterActivator_var (void); // destructor + + AdapterActivator_var &operator= (AdapterActivator_ptr); + AdapterActivator_var &operator= (const AdapterActivator_var &); + AdapterActivator_ptr operator-> (void) const; + + operator const AdapterActivator_ptr &() const; + operator AdapterActivator_ptr &(); + // in, inout, out, _retn + AdapterActivator_ptr in (void) const; + AdapterActivator_ptr &inout (void); + AdapterActivator_ptr &out (void); + AdapterActivator_ptr _retn (void); + AdapterActivator_ptr ptr (void) const; + + private: + AdapterActivator_ptr ptr_; + }; #endif // end #if !defined @@ -1448,22 +1409,22 @@ AdapterActivator_ptr ptr_; #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_ -class TAO_Export AdapterActivator_out -{ -public: -AdapterActivator_out (AdapterActivator_ptr &); -AdapterActivator_out (AdapterActivator_var &); -AdapterActivator_out (AdapterActivator_out &); -AdapterActivator_out &operator= (AdapterActivator_out &); -AdapterActivator_out &operator= (const AdapterActivator_var &); -AdapterActivator_out &operator= (AdapterActivator_ptr); -operator AdapterActivator_ptr &(); -AdapterActivator_ptr &ptr (void); -AdapterActivator_ptr operator-> (void); - -private: -AdapterActivator_ptr &ptr_; -}; + class TAO_Export AdapterActivator_out + { + public: + AdapterActivator_out (AdapterActivator_ptr &); + AdapterActivator_out (AdapterActivator_var &); + AdapterActivator_out (AdapterActivator_out &); + AdapterActivator_out &operator= (AdapterActivator_out &); + AdapterActivator_out &operator= (const AdapterActivator_var &); + AdapterActivator_out &operator= (AdapterActivator_ptr); + operator AdapterActivator_ptr &(); + AdapterActivator_ptr &ptr (void); + AdapterActivator_ptr operator-> (void); + + private: + AdapterActivator_ptr &ptr_; + }; #endif // end #if !defined @@ -1472,69 +1433,72 @@ AdapterActivator_ptr &ptr_; #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_ -class TAO_Export AdapterActivator: public virtual CORBA::Object -{ -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 _nil (void); -static AdapterActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -AdapterActivator (void); // default constructor -AdapterActivator (STUB_Object *objref); -public: -virtual ~AdapterActivator (void); -private: -AdapterActivator (const AdapterActivator&); -void operator= (const AdapterActivator&); -}; + class TAO_Export AdapterActivator: public virtual CORBA::Object + { + 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 _nil (void); + static AdapterActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + AdapterActivator ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~AdapterActivator (void); + private: + AdapterActivator (const AdapterActivator&); + void operator= (const AdapterActivator&); + }; -#endif // end #if !defined -static CORBA::TypeCode_ptr _tc_AdapterActivator; +#endif // end #if !defined + static CORBA::TypeCode_ptr _tc_AdapterActivator; + #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_) #define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_ class ServantManager; -typedef ServantManager *ServantManager_ptr; - + typedef ServantManager *ServantManager_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_) #define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_ -class TAO_Export ServantManager_var -{ -public: -ServantManager_var (void); // default constructor -ServantManager_var (ServantManager_ptr); -ServantManager_var (const ServantManager_var &); // copy constructor -~ServantManager_var (void); // destructor - -ServantManager_var &operator= (ServantManager_ptr); -ServantManager_var &operator= (const ServantManager_var &); -ServantManager_ptr operator-> (void) const; - -operator const ServantManager_ptr &() const; -operator ServantManager_ptr &(); -// in, inout, out, _retn -ServantManager_ptr in (void) const; -ServantManager_ptr &inout (void); -ServantManager_ptr &out (void); -ServantManager_ptr _retn (void); -ServantManager_ptr ptr (void) const; - -private: -ServantManager_ptr ptr_; -}; + class TAO_Export ServantManager_var + { + public: + ServantManager_var (void); // default constructor + ServantManager_var (ServantManager_ptr); + ServantManager_var (const ServantManager_var &); // copy constructor + ~ServantManager_var (void); // destructor + + ServantManager_var &operator= (ServantManager_ptr); + ServantManager_var &operator= (const ServantManager_var &); + ServantManager_ptr operator-> (void) const; + + operator const ServantManager_ptr &() const; + operator ServantManager_ptr &(); + // in, inout, out, _retn + ServantManager_ptr in (void) const; + ServantManager_ptr &inout (void); + ServantManager_ptr &out (void); + ServantManager_ptr _retn (void); + ServantManager_ptr ptr (void) const; + + private: + ServantManager_ptr ptr_; + }; #endif // end #if !defined @@ -1543,22 +1507,22 @@ ServantManager_ptr ptr_; #if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_) #define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_ -class TAO_Export ServantManager_out -{ -public: -ServantManager_out (ServantManager_ptr &); -ServantManager_out (ServantManager_var &); -ServantManager_out (ServantManager_out &); -ServantManager_out &operator= (ServantManager_out &); -ServantManager_out &operator= (const ServantManager_var &); -ServantManager_out &operator= (ServantManager_ptr); -operator ServantManager_ptr &(); -ServantManager_ptr &ptr (void); -ServantManager_ptr operator-> (void); - -private: -ServantManager_ptr &ptr_; -}; + class TAO_Export ServantManager_out + { + public: + ServantManager_out (ServantManager_ptr &); + ServantManager_out (ServantManager_var &); + ServantManager_out (ServantManager_out &); + ServantManager_out &operator= (ServantManager_out &); + ServantManager_out &operator= (const ServantManager_var &); + ServantManager_out &operator= (ServantManager_ptr); + operator ServantManager_ptr &(); + ServantManager_ptr &ptr (void); + ServantManager_ptr operator-> (void); + + private: + ServantManager_ptr &ptr_; + }; #endif // end #if !defined @@ -1567,68 +1531,71 @@ ServantManager_ptr &ptr_; #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_) #define _PORTABLESERVER_SERVANTMANAGER_CH_ -class TAO_Export ServantManager: public virtual CORBA::Object -{ -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 _nil (void); -static ServantManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -ServantManager (void); // default constructor -ServantManager (STUB_Object *objref); -public: -virtual ~ServantManager (void); -private: -ServantManager (const ServantManager&); -void operator= (const ServantManager&); -}; + class TAO_Export ServantManager: public virtual CORBA::Object + { + 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 _nil (void); + static ServantManager_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + ServantManager ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~ServantManager (void); + private: + ServantManager (const ServantManager&); + void operator= (const ServantManager&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_ServantManager; - + static CORBA::TypeCode_ptr _tc_ServantManager; + #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_ class ServantActivator; -typedef ServantActivator *ServantActivator_ptr; - + typedef ServantActivator *ServantActivator_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_ -class TAO_Export ServantActivator_var -{ -public: -ServantActivator_var (void); // default constructor -ServantActivator_var (ServantActivator_ptr); -ServantActivator_var (const ServantActivator_var &); // copy constructor -~ServantActivator_var (void); // destructor - -ServantActivator_var &operator= (ServantActivator_ptr); -ServantActivator_var &operator= (const ServantActivator_var &); -ServantActivator_ptr operator-> (void) const; - -operator const ServantActivator_ptr &() const; -operator ServantActivator_ptr &(); -// in, inout, out, _retn -ServantActivator_ptr in (void) const; -ServantActivator_ptr &inout (void); -ServantActivator_ptr &out (void); -ServantActivator_ptr _retn (void); -ServantActivator_ptr ptr (void) const; - -private: -ServantActivator_ptr ptr_; -}; + class TAO_Export ServantActivator_var + { + public: + ServantActivator_var (void); // default constructor + ServantActivator_var (ServantActivator_ptr); + ServantActivator_var (const ServantActivator_var &); // copy constructor + ~ServantActivator_var (void); // destructor + + ServantActivator_var &operator= (ServantActivator_ptr); + ServantActivator_var &operator= (const ServantActivator_var &); + ServantActivator_ptr operator-> (void) const; + + operator const ServantActivator_ptr &() const; + operator ServantActivator_ptr &(); + // in, inout, out, _retn + ServantActivator_ptr in (void) const; + ServantActivator_ptr &inout (void); + ServantActivator_ptr &out (void); + ServantActivator_ptr _retn (void); + ServantActivator_ptr ptr (void) const; + + private: + ServantActivator_ptr ptr_; + }; #endif // end #if !defined @@ -1637,22 +1604,22 @@ ServantActivator_ptr ptr_; #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_ -class TAO_Export ServantActivator_out -{ -public: -ServantActivator_out (ServantActivator_ptr &); -ServantActivator_out (ServantActivator_var &); -ServantActivator_out (ServantActivator_out &); -ServantActivator_out &operator= (ServantActivator_out &); -ServantActivator_out &operator= (const ServantActivator_var &); -ServantActivator_out &operator= (ServantActivator_ptr); -operator ServantActivator_ptr &(); -ServantActivator_ptr &ptr (void); -ServantActivator_ptr operator-> (void); - -private: -ServantActivator_ptr &ptr_; -}; + class TAO_Export ServantActivator_out + { + public: + ServantActivator_out (ServantActivator_ptr &); + ServantActivator_out (ServantActivator_var &); + ServantActivator_out (ServantActivator_out &); + ServantActivator_out &operator= (ServantActivator_out &); + ServantActivator_out &operator= (const ServantActivator_var &); + ServantActivator_out &operator= (ServantActivator_ptr); + operator ServantActivator_ptr &(); + ServantActivator_ptr &ptr (void); + ServantActivator_ptr operator-> (void); + + private: + ServantActivator_ptr &ptr_; + }; #endif // end #if !defined @@ -1661,70 +1628,73 @@ ServantActivator_ptr &ptr_; #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_) #define _PORTABLESERVER_SERVANTACTIVATOR_CH_ -class TAO_Export ServantActivator: public virtual ServantManager -{ -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 _nil (void); -static ServantActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA::Environment &env); -virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -ServantActivator (void); // default constructor -ServantActivator (STUB_Object *objref); -public: -virtual ~ServantActivator (void); -private: -ServantActivator (const ServantActivator&); -void operator= (const ServantActivator&); -}; + class TAO_Export ServantActivator: public virtual ServantManager + { + 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 _nil (void); + static ServantActivator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA::Environment &env); + virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + ServantActivator ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~ServantActivator (void); + private: + ServantActivator (const ServantActivator&); + void operator= (const ServantActivator&); + }; -#endif // end #if !defined -static CORBA::TypeCode_ptr _tc_ServantActivator; +#endif // end #if !defined + static CORBA::TypeCode_ptr _tc_ServantActivator; + #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_ class ServantLocator; -typedef ServantLocator *ServantLocator_ptr; - + typedef ServantLocator *ServantLocator_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_ -class TAO_Export ServantLocator_var -{ -public: -ServantLocator_var (void); // default constructor -ServantLocator_var (ServantLocator_ptr); -ServantLocator_var (const ServantLocator_var &); // copy constructor -~ServantLocator_var (void); // destructor - -ServantLocator_var &operator= (ServantLocator_ptr); -ServantLocator_var &operator= (const ServantLocator_var &); -ServantLocator_ptr operator-> (void) const; - -operator const ServantLocator_ptr &() const; -operator ServantLocator_ptr &(); -// in, inout, out, _retn -ServantLocator_ptr in (void) const; -ServantLocator_ptr &inout (void); -ServantLocator_ptr &out (void); -ServantLocator_ptr _retn (void); -ServantLocator_ptr ptr (void) const; - -private: -ServantLocator_ptr ptr_; -}; + class TAO_Export ServantLocator_var + { + public: + ServantLocator_var (void); // default constructor + ServantLocator_var (ServantLocator_ptr); + ServantLocator_var (const ServantLocator_var &); // copy constructor + ~ServantLocator_var (void); // destructor + + ServantLocator_var &operator= (ServantLocator_ptr); + ServantLocator_var &operator= (const ServantLocator_var &); + ServantLocator_ptr operator-> (void) const; + + operator const ServantLocator_ptr &() const; + operator ServantLocator_ptr &(); + // in, inout, out, _retn + ServantLocator_ptr in (void) const; + ServantLocator_ptr &inout (void); + ServantLocator_ptr &out (void); + ServantLocator_ptr _retn (void); + ServantLocator_ptr ptr (void) const; + + private: + ServantLocator_ptr ptr_; + }; #endif // end #if !defined @@ -1733,22 +1703,22 @@ ServantLocator_ptr ptr_; #if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_) #define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_ -class TAO_Export ServantLocator_out -{ -public: -ServantLocator_out (ServantLocator_ptr &); -ServantLocator_out (ServantLocator_var &); -ServantLocator_out (ServantLocator_out &); -ServantLocator_out &operator= (ServantLocator_out &); -ServantLocator_out &operator= (const ServantLocator_var &); -ServantLocator_out &operator= (ServantLocator_ptr); -operator ServantLocator_ptr &(); -ServantLocator_ptr &ptr (void); -ServantLocator_ptr operator-> (void); - -private: -ServantLocator_ptr &ptr_; -}; + class TAO_Export ServantLocator_out + { + public: + ServantLocator_out (ServantLocator_ptr &); + ServantLocator_out (ServantLocator_var &); + ServantLocator_out (ServantLocator_out &); + ServantLocator_out &operator= (ServantLocator_out &); + ServantLocator_out &operator= (const ServantLocator_var &); + ServantLocator_out &operator= (ServantLocator_ptr); + operator ServantLocator_ptr &(); + ServantLocator_ptr &ptr (void); + ServantLocator_ptr operator-> (void); + + private: + ServantLocator_ptr &ptr_; + }; #endif // end #if !defined @@ -1757,73 +1727,76 @@ ServantLocator_ptr &ptr_; #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_) #define _PORTABLESERVER_SERVANTLOCATOR_CH_ -class TAO_Export ServantLocator: public virtual ServantManager -{ -public: - - typedef void *Cookie; - -// the static operations -static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); -static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); -static ServantLocator_ptr _nil (void); -static ServantLocator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - -virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, CORBA::Environment &env); -virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -ServantLocator (void); // default constructor -ServantLocator (STUB_Object *objref); -public: -virtual ~ServantLocator (void); -private: -ServantLocator (const ServantLocator&); -void operator= (const ServantLocator&); -}; + class TAO_Export ServantLocator: public virtual ServantManager + { + public: + typedef void *Cookie; + + // the static operations + static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); + static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env); + static ServantLocator_ptr _nil (void); + static ServantLocator_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + + virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, CORBA::Environment &env); + virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + ServantLocator ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~ServantLocator (void); + private: + ServantLocator (const ServantLocator&); + void operator= (const ServantLocator&); + }; -#endif // end #if !defined -static CORBA::TypeCode_ptr _tc_ServantLocator; +#endif // end #if !defined + static CORBA::TypeCode_ptr _tc_ServantLocator; + #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ class POA; -typedef POA *POA_ptr; - + typedef POA *POA_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA___VAR_CH_) #define _PORTABLESERVER_POA___VAR_CH_ -class TAO_Export POA_var -{ -public: -POA_var (void); // default constructor -POA_var (POA_ptr); -POA_var (const POA_var &); // copy constructor -~POA_var (void); // destructor - -POA_var &operator= (POA_ptr); -POA_var &operator= (const POA_var &); -POA_ptr operator-> (void) const; - -operator const POA_ptr &() const; -operator POA_ptr &(); -// in, inout, out, _retn -POA_ptr in (void) const; -POA_ptr &inout (void); -POA_ptr &out (void); -POA_ptr _retn (void); -POA_ptr ptr (void) const; - -private: -POA_ptr ptr_; -}; + class TAO_Export POA_var + { + public: + POA_var (void); // default constructor + POA_var (POA_ptr); + POA_var (const POA_var &); // copy constructor + ~POA_var (void); // destructor + + POA_var &operator= (POA_ptr); + POA_var &operator= (const POA_var &); + POA_ptr operator-> (void) const; + + operator const POA_ptr &() const; + operator POA_ptr &(); + // in, inout, out, _retn + POA_ptr in (void) const; + POA_ptr &inout (void); + POA_ptr &out (void); + POA_ptr _retn (void); + POA_ptr ptr (void) const; + + private: + POA_ptr ptr_; + }; #endif // end #if !defined @@ -1832,22 +1805,22 @@ POA_ptr ptr_; #if !defined (_PORTABLESERVER_POA___OUT_CH_) #define _PORTABLESERVER_POA___OUT_CH_ -class TAO_Export POA_out -{ -public: -POA_out (POA_ptr &); -POA_out (POA_var &); -POA_out (POA_out &); -POA_out &operator= (POA_out &); -POA_out &operator= (const POA_var &); -POA_out &operator= (POA_ptr); -operator POA_ptr &(); -POA_ptr &ptr (void); -POA_ptr operator-> (void); - -private: -POA_ptr &ptr_; -}; + class TAO_Export POA_out + { + public: + POA_out (POA_ptr &); + POA_out (POA_var &); + POA_out (POA_out &); + POA_out &operator= (POA_out &); + POA_out &operator= (const POA_var &); + POA_out &operator= (POA_ptr); + operator POA_ptr &(); + POA_ptr &ptr (void); + POA_ptr operator-> (void); + + private: + POA_ptr &ptr_; + }; #endif // end #if !defined @@ -1856,397 +1829,400 @@ POA_ptr &ptr_; #if !defined (_PORTABLESERVER_POA_CH_) #define _PORTABLESERVER_POA_CH_ -class TAO_Export POA: public virtual CORBA::Object -{ -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 _nil (void); -static POA_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - + class TAO_Export POA: public virtual CORBA::Object + { + 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 _nil (void); + static POA_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS___PTR_CH_ -class AdapterAlreadyExists; -typedef AdapterAlreadyExists *AdapterAlreadyExists_ptr; - + class AdapterAlreadyExists; + typedef AdapterAlreadyExists *AdapterAlreadyExists_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_) #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_ -class TAO_Export AdapterAlreadyExists : public CORBA::UserException -{ -public: -AdapterAlreadyExists (void); // default ctor -AdapterAlreadyExists (const AdapterAlreadyExists &); // copy ctor -~AdapterAlreadyExists(void); // dtor -AdapterAlreadyExists &operator= (const AdapterAlreadyExists &); -static AdapterAlreadyExists *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_AdapterAlreadyExists; + class TAO_Export AdapterAlreadyExists : public CORBA::UserException + { + public: + AdapterAlreadyExists (void); // default ctor + AdapterAlreadyExists (const AdapterAlreadyExists &); // copy ctor + ~AdapterAlreadyExists(void); // dtor + AdapterAlreadyExists &operator= (const AdapterAlreadyExists &); + static AdapterAlreadyExists *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_AdapterAlreadyExists; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_ -class AdapterInactive; -typedef AdapterInactive *AdapterInactive_ptr; - + class AdapterInactive; + typedef AdapterInactive *AdapterInactive_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE_CH_) #define _PORTABLESERVER_POA_ADAPTERINACTIVE_CH_ -class TAO_Export AdapterInactive : public CORBA::UserException -{ -public: -AdapterInactive (void); // default ctor -AdapterInactive (const AdapterInactive &); // copy ctor -~AdapterInactive(void); // dtor -AdapterInactive &operator= (const AdapterInactive &); -static AdapterInactive *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_AdapterInactive; + class TAO_Export AdapterInactive : public CORBA::UserException + { + public: + AdapterInactive (void); // default ctor + AdapterInactive (const AdapterInactive &); // copy ctor + ~AdapterInactive(void); // dtor + AdapterInactive &operator= (const AdapterInactive &); + static AdapterInactive *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_AdapterInactive; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_) #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_ -class AdapterNonExistent; -typedef AdapterNonExistent *AdapterNonExistent_ptr; - + class AdapterNonExistent; + typedef AdapterNonExistent *AdapterNonExistent_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_) #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_ -class TAO_Export AdapterNonExistent : public CORBA::UserException -{ -public: -AdapterNonExistent (void); // default ctor -AdapterNonExistent (const AdapterNonExistent &); // copy ctor -~AdapterNonExistent(void); // dtor -AdapterNonExistent &operator= (const AdapterNonExistent &); -static AdapterNonExistent *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_AdapterNonExistent; + class TAO_Export AdapterNonExistent : public CORBA::UserException + { + public: + AdapterNonExistent (void); // default ctor + AdapterNonExistent (const AdapterNonExistent &); // copy ctor + ~AdapterNonExistent(void); // dtor + AdapterNonExistent &operator= (const AdapterNonExistent &); + static AdapterNonExistent *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_AdapterNonExistent; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_) #define _PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_ -class InvalidPolicy; -typedef InvalidPolicy *InvalidPolicy_ptr; - + class InvalidPolicy; + typedef InvalidPolicy *InvalidPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_) #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_ -class TAO_Export InvalidPolicy : public CORBA::UserException -{ -public: -InvalidPolicy (void); // default ctor -InvalidPolicy (const InvalidPolicy &); // copy ctor -~InvalidPolicy(void); // dtor -InvalidPolicy(const CORBA::UShort); -InvalidPolicy &operator= (const InvalidPolicy &); -static InvalidPolicy *_narrow (CORBA::Exception *); -CORBA::UShort index; -}; -static CORBA::TypeCode_ptr _tc_InvalidPolicy; + class TAO_Export InvalidPolicy : public CORBA::UserException + { + public: + InvalidPolicy (void); // default ctor + InvalidPolicy (const InvalidPolicy &); // copy ctor + ~InvalidPolicy(void); // dtor + InvalidPolicy(const CORBA::UShort); + InvalidPolicy &operator= (const InvalidPolicy &); + static InvalidPolicy *_narrow (CORBA::Exception *); + CORBA::UShort index; + }; + static CORBA::TypeCode_ptr _tc_InvalidPolicy; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_) #define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_ -class NoServant; -typedef NoServant *NoServant_ptr; - + class NoServant; + typedef NoServant *NoServant_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) #define _PORTABLESERVER_POA_NOSERVANT_CH_ -class TAO_Export NoServant : public CORBA::UserException -{ -public: -NoServant (void); // default ctor -NoServant (const NoServant &); // copy ctor -~NoServant(void); // dtor -NoServant &operator= (const NoServant &); -static NoServant *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_NoServant; + class TAO_Export NoServant : public CORBA::UserException + { + public: + NoServant (void); // default ctor + NoServant (const NoServant &); // copy ctor + ~NoServant(void); // dtor + NoServant &operator= (const NoServant &); + static NoServant *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_NoServant; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_ -class ObjectAlreadyActive; -typedef ObjectAlreadyActive *ObjectAlreadyActive_ptr; - + class ObjectAlreadyActive; + typedef ObjectAlreadyActive *ObjectAlreadyActive_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_ -class TAO_Export ObjectAlreadyActive : public CORBA::UserException -{ -public: -ObjectAlreadyActive (void); // default ctor -ObjectAlreadyActive (const ObjectAlreadyActive &); // copy ctor -~ObjectAlreadyActive(void); // dtor -ObjectAlreadyActive &operator= (const ObjectAlreadyActive &); -static ObjectAlreadyActive *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_ObjectAlreadyActive; + class TAO_Export ObjectAlreadyActive : public CORBA::UserException + { + public: + ObjectAlreadyActive (void); // default ctor + ObjectAlreadyActive (const ObjectAlreadyActive &); // copy ctor + ~ObjectAlreadyActive(void); // dtor + ObjectAlreadyActive &operator= (const ObjectAlreadyActive &); + static ObjectAlreadyActive *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_ObjectAlreadyActive; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_ -class ObjectNotActive; -typedef ObjectNotActive *ObjectNotActive_ptr; - + class ObjectNotActive; + typedef ObjectNotActive *ObjectNotActive_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_ -class TAO_Export ObjectNotActive : public CORBA::UserException -{ -public: -ObjectNotActive (void); // default ctor -ObjectNotActive (const ObjectNotActive &); // copy ctor -~ObjectNotActive(void); // dtor -ObjectNotActive &operator= (const ObjectNotActive &); -static ObjectNotActive *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_ObjectNotActive; + class TAO_Export ObjectNotActive : public CORBA::UserException + { + public: + ObjectNotActive (void); // default ctor + ObjectNotActive (const ObjectNotActive &); // copy ctor + ~ObjectNotActive(void); // dtor + ObjectNotActive &operator= (const ObjectNotActive &); + static ObjectNotActive *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_ObjectNotActive; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_ -class ServantAlreadyActive; -typedef ServantAlreadyActive *ServantAlreadyActive_ptr; - + class ServantAlreadyActive; + typedef ServantAlreadyActive *ServantAlreadyActive_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_ -class TAO_Export ServantAlreadyActive : public CORBA::UserException -{ -public: -ServantAlreadyActive (void); // default ctor -ServantAlreadyActive (const ServantAlreadyActive &); // copy ctor -~ServantAlreadyActive(void); // dtor -ServantAlreadyActive &operator= (const ServantAlreadyActive &); -static ServantAlreadyActive *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_ServantAlreadyActive; + class TAO_Export ServantAlreadyActive : public CORBA::UserException + { + public: + ServantAlreadyActive (void); // default ctor + ServantAlreadyActive (const ServantAlreadyActive &); // copy ctor + ~ServantAlreadyActive(void); // dtor + ServantAlreadyActive &operator= (const ServantAlreadyActive &); + static ServantAlreadyActive *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_ServantAlreadyActive; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_) #define _PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_ -class ServantNotActive; -typedef ServantNotActive *ServantNotActive_ptr; - + class ServantNotActive; + typedef ServantNotActive *ServantNotActive_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_) #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_ -class TAO_Export ServantNotActive : public CORBA::UserException -{ -public: -ServantNotActive (void); // default ctor -ServantNotActive (const ServantNotActive &); // copy ctor -~ServantNotActive(void); // dtor -ServantNotActive &operator= (const ServantNotActive &); -static ServantNotActive *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_ServantNotActive; + class TAO_Export ServantNotActive : public CORBA::UserException + { + public: + ServantNotActive (void); // default ctor + ServantNotActive (const ServantNotActive &); // copy ctor + ~ServantNotActive(void); // dtor + ServantNotActive &operator= (const ServantNotActive &); + static ServantNotActive *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_ServantNotActive; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_) #define _PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_ -class WrongAdapter; -typedef WrongAdapter *WrongAdapter_ptr; - + class WrongAdapter; + typedef WrongAdapter *WrongAdapter_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_) #define _PORTABLESERVER_POA_WRONGADAPTER_CH_ -class TAO_Export WrongAdapter : public CORBA::UserException -{ -public: -WrongAdapter (void); // default ctor -WrongAdapter (const WrongAdapter &); // copy ctor -~WrongAdapter(void); // dtor -WrongAdapter &operator= (const WrongAdapter &); -static WrongAdapter *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_WrongAdapter; + class TAO_Export WrongAdapter : public CORBA::UserException + { + public: + WrongAdapter (void); // default ctor + WrongAdapter (const WrongAdapter &); // copy ctor + ~WrongAdapter(void); // dtor + WrongAdapter &operator= (const WrongAdapter &); + static WrongAdapter *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_WrongAdapter; #endif // end #if !defined - + #if !defined (_PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_) #define _PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_ -class WrongPolicy; -typedef WrongPolicy *WrongPolicy_ptr; - + class WrongPolicy; + typedef WrongPolicy *WrongPolicy_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_) #define _PORTABLESERVER_POA_WRONGPOLICY_CH_ -class TAO_Export WrongPolicy : public CORBA::UserException -{ -public: -WrongPolicy (void); // default ctor -WrongPolicy (const WrongPolicy &); // copy ctor -~WrongPolicy(void); // dtor -WrongPolicy &operator= (const WrongPolicy &); -static WrongPolicy *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_WrongPolicy; - - -#endif // end #if !defined - -virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const PolicyList &policies, CORBA::Environment &env); -virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env); -virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env); -virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA::Environment &env); -virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA::Environment &env); -virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA::Environment &env); -virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA::Environment &env); -virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA::Environment &env); -virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA::Environment &env); -virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA::Environment &env); -virtual char * the_name (CORBA::Environment &env); -virtual POA_ptr the_parent (CORBA::Environment &env); -virtual POAManager_ptr the_POAManager (CORBA::Environment &env); -virtual AdapterActivator_ptr the_activator (CORBA::Environment &env); -virtual void the_activator(AdapterActivator_ptr the_activator, CORBA::Environment &env); -virtual ServantManager_ptr get_servant_manager (CORBA::Environment &env); -virtual void set_servant_manager (ServantManager_ptr imgr, CORBA::Environment &env); -virtual Servant get_servant (CORBA::Environment &env); -virtual void set_servant (Servant p_servant, CORBA::Environment &env); -virtual ObjectId * activate_object (Servant p_servant, CORBA::Environment &env); -virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA::Environment &env); -virtual void deactivate_object (const ObjectId &oid, CORBA::Environment &env); -virtual CORBA::Object_ptr create_reference (const char *intf, CORBA::Environment &env); -virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA::Environment &env); -virtual ObjectId * servant_to_id (Servant p_servant, CORBA::Environment &env); -virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA::Environment &env); -virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env); -virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env); -virtual Servant id_to_servant (const ObjectId &oid, CORBA::Environment &env); -virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA::Environment &env); -virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); -protected: -POA (void); // default constructor -POA (STUB_Object *objref); -public: -virtual ~POA (void); -private: -POA (const POA&); -void operator= (const POA&); -}; + class TAO_Export WrongPolicy : public CORBA::UserException + { + public: + WrongPolicy (void); // default ctor + WrongPolicy (const WrongPolicy &); // copy ctor + ~WrongPolicy(void); // dtor + WrongPolicy &operator= (const WrongPolicy &); + static WrongPolicy *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_WrongPolicy; + + +#endif // end #if !defined + + virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const PolicyList &policies, CORBA::Environment &env); + virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &env); + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env); + virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA::Environment &env); + virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA::Environment &env); + virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA::Environment &env); + virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA::Environment &env); + virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA::Environment &env); + virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA::Environment &env); + virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA::Environment &env); + virtual char * the_name (CORBA::Environment &env); + virtual POA_ptr the_parent (CORBA::Environment &env); + virtual POAManager_ptr the_POAManager (CORBA::Environment &env); + virtual AdapterActivator_ptr the_activator (CORBA::Environment &env); + virtual void the_activator(AdapterActivator_ptr the_activator, CORBA::Environment &env); + virtual ServantManager_ptr get_servant_manager (CORBA::Environment &env); + virtual void set_servant_manager (ServantManager_ptr imgr, CORBA::Environment &env); + virtual Servant get_servant (CORBA::Environment &env); + virtual void set_servant (Servant p_servant, CORBA::Environment &env); + virtual ObjectId * activate_object (Servant p_servant, CORBA::Environment &env); + virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA::Environment &env); + virtual void deactivate_object (const ObjectId &oid, CORBA::Environment &env); + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA::Environment &env); + virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA::Environment &env); + virtual ObjectId * servant_to_id (Servant p_servant, CORBA::Environment &env); + virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA::Environment &env); + virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &env); + virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &env); + virtual Servant id_to_servant (const ObjectId &oid, CORBA::Environment &env); + virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA::Environment &env); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA::Environment &env); + protected: + POA ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~POA (void); + private: + POA (const POA&); + void operator= (const POA&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_POA; - + static CORBA::TypeCode_ptr _tc_POA; + #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_) #define _PORTABLESERVER_CURRENT___PTR_CH_ class Current; -typedef Current *Current_ptr; - + typedef Current *Current_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_CURRENT___VAR_CH_) #define _PORTABLESERVER_CURRENT___VAR_CH_ -class TAO_Export Current_var -{ -public: -Current_var (void); // default constructor -Current_var (Current_ptr); -Current_var (const Current_var &); // copy constructor -~Current_var (void); // destructor - -Current_var &operator= (Current_ptr); -Current_var &operator= (const Current_var &); -Current_ptr operator-> (void) const; - -operator const Current_ptr &() const; -operator Current_ptr &(); -// in, inout, out, _retn -Current_ptr in (void) const; -Current_ptr &inout (void); -Current_ptr &out (void); -Current_ptr _retn (void); -Current_ptr ptr (void) const; - -private: -Current_ptr ptr_; -}; + class TAO_Export Current_var + { + public: + Current_var (void); // default constructor + Current_var (Current_ptr); + Current_var (const Current_var &); // copy constructor + ~Current_var (void); // destructor + + Current_var &operator= (Current_ptr); + Current_var &operator= (const Current_var &); + Current_ptr operator-> (void) const; + + operator const Current_ptr &() const; + operator Current_ptr &(); + // in, inout, out, _retn + Current_ptr in (void) const; + Current_ptr &inout (void); + Current_ptr &out (void); + Current_ptr _retn (void); + Current_ptr ptr (void) const; + + private: + Current_ptr ptr_; + }; #endif // end #if !defined @@ -2255,22 +2231,22 @@ Current_ptr ptr_; #if !defined (_PORTABLESERVER_CURRENT___OUT_CH_) #define _PORTABLESERVER_CURRENT___OUT_CH_ -class TAO_Export Current_out -{ -public: -Current_out (Current_ptr &); -Current_out (Current_var &); -Current_out (Current_out &); -Current_out &operator= (Current_out &); -Current_out &operator= (const Current_var &); -Current_out &operator= (Current_ptr); -operator Current_ptr &(); -Current_ptr &ptr (void); -Current_ptr operator-> (void); - -private: -Current_ptr &ptr_; -}; + class TAO_Export Current_out + { + public: + Current_out (Current_ptr &); + Current_out (Current_var &); + Current_out (Current_out &); + Current_out &operator= (Current_out &); + Current_out &operator= (const Current_var &); + Current_out &operator= (Current_ptr); + operator Current_ptr &(); + Current_ptr &ptr (void); + Current_ptr operator-> (void); + + private: + Current_ptr &ptr_; + }; #endif // end #if !defined @@ -2279,65 +2255,68 @@ Current_ptr &ptr_; #if !defined (_PORTABLESERVER_CURRENT_CH_) #define _PORTABLESERVER_CURRENT_CH_ -class TAO_Export Current: public virtual CurrentBase -{ -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 _nil (void); -static Current_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); - + class TAO_Export Current: public virtual CurrentBase + { + 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 _nil (void); + static Current_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env); + #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_) #define _PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_ -class NoContext; -typedef NoContext *NoContext_ptr; - + class NoContext; + typedef NoContext *NoContext_ptr; + #endif // end #if !defined #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_) #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_ -class TAO_Export NoContext : public CORBA::UserException -{ -public: -NoContext (void); // default ctor -NoContext (const NoContext &); // copy ctor -~NoContext(void); // dtor -NoContext &operator= (const NoContext &); -static NoContext *_narrow (CORBA::Exception *); -}; -static CORBA::TypeCode_ptr _tc_NoContext; + class TAO_Export NoContext : public CORBA::UserException + { + public: + NoContext (void); // default ctor + NoContext (const NoContext &); // copy ctor + ~NoContext(void); // dtor + NoContext &operator= (const NoContext &); + static NoContext *_narrow (CORBA::Exception *); + }; + static CORBA::TypeCode_ptr _tc_NoContext; #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); -protected: -Current (void); // default constructor -Current (STUB_Object *objref); -public: -virtual ~Current (void); -private: -Current (const Current&); -void operator= (const Current&); -}; + 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); + protected: + Current ( + STUB_Object *objref = 0, + TAO_ServantBase *servant = 0, + CORBA::Boolean collocated = CORBA::B_FALSE + ); + public: + virtual ~Current (void); + private: + Current (const Current&); + void operator= (const Current&); + }; #endif // end #if !defined -static CORBA::TypeCode_ptr _tc_Current; + static CORBA::TypeCode_ptr _tc_Current; }; #if defined (__ACE_INLINE__) -#include "POAC.i" +#include "poaC.i" #endif // defined INLINE diff --git a/TAO/tao/poaC.i b/TAO/tao/poaC.i index 79bc7b86c25..1e91f098883 100644 --- a/TAO/tao/poaC.i +++ b/TAO/tao/poaC.i @@ -6,18 +6,24 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html ACE_INLINE -PortableServer::CurrentBase::CurrentBase (void) // default constructor -{} - -ACE_INLINE -PortableServer::CurrentBase::CurrentBase (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::CurrentBase::CurrentBase( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::CurrentBase::~CurrentBase (void) // destructor {} +ACE_INLINE PortableServer::CurrentBase_ptr +PortableServer::CurrentBase::_nil (void) +{ + return (PortableServer::CurrentBase_ptr)0; +} + #if !defined (_PORTABLESERVER_CURRENTBASE___VAR_CI_) #define _PORTABLESERVER_CURRENTBASE___VAR_CI_ @@ -193,18 +199,24 @@ PortableServer::CurrentBase_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::Policy::Policy (void) // default constructor -{} - -ACE_INLINE -PortableServer::Policy::Policy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::Policy::Policy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::Policy::~Policy (void) // destructor {} +ACE_INLINE PortableServer::Policy_ptr +PortableServer::Policy::_nil (void) +{ + return (PortableServer::Policy_ptr)0; +} + #if !defined (_PORTABLESERVER_POLICY___VAR_CI_) #define _PORTABLESERVER_POLICY___VAR_CI_ @@ -380,101 +392,6 @@ PortableServer::Policy_out::operator-> (void) #endif // end #if !defined -#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_TAO_OBJREFMNGTYPE_CI_) -#define _PORTABLESERVER__TAO_SEQ_POLICY_TAO_OBJREFMNGTYPE_CI_ - -// ************************************************************* -// Inline operations for class PortableServer::_tao_seq_Policy::TAO_ObjRefMngType -// ************************************************************* - -ACE_INLINE -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::~TAO_ObjRefMngType (void) // destructor -{} - -ACE_INLINE -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::TAO_ObjRefMngType(PortableServer::Policy_ptr* buffer, CORBA::Boolean release) - : ptr_ (buffer), - release_ (release) -{} - -ACE_INLINE -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::operator const PortableServer::Policy_ptr &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::operator PortableServer::Policy_ptr &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE const PortableServer::Policy_ptr -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE PortableServer::Policy_ptr& -PortableServer::_tao_seq_Policy::TAO_ObjRefMngType::inout (void) -{ - return *this->ptr_; -} - - -#endif // end #if !defined - - -#if !defined (_PORTABLESERVER__TAO_SEQ_POLICY_CI_) -#define _PORTABLESERVER__TAO_SEQ_POLICY_CI_ - -// ************************************************************* -// class PortableServer::_tao_seq_Policy -// ************************************************************* - -ACE_INLINE void -PortableServer::_tao_seq_Policy::freebuf (PortableServer::Policy_ptr *seq) -{ - delete []seq; -} - -//default constructor -ACE_INLINE -PortableServer::_tao_seq_Policy::_tao_seq_Policy (void) - : maximum_ (0), - length_ (0), - buffer_ (0), - release_ (0) // does not own -{} - -ACE_INLINE CORBA::ULong -PortableServer::_tao_seq_Policy::maximum (void) const -{ - return this->maximum_; -} - -ACE_INLINE CORBA::ULong -PortableServer::_tao_seq_Policy::length (void) const -{ - return this->length_; -} - -ACE_INLINE PortableServer::_tao_seq_Policy::TAO_ObjRefMngType -PortableServer::_tao_seq_Policy::operator[] (CORBA::ULong index) // read/write -{ - return PortableServer::_tao_seq_Policy::TAO_ObjRefMngType (&this->buffer_[index], this->release_); -} - -ACE_INLINE const PortableServer::_tao_seq_Policy::TAO_ObjRefMngType -PortableServer::_tao_seq_Policy::operator[] (CORBA::ULong index) const // read -{ - return PortableServer::_tao_seq_Policy::TAO_ObjRefMngType (&this->buffer_[index], this->release_); -} - - -#endif // end #if !defined - - #if !defined (_PORTABLESERVER__TAO_SEQ_POLICY___VAR_CI_) #define _PORTABLESERVER__TAO_SEQ_POLICY___VAR_CI_ @@ -488,7 +405,7 @@ PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (void) // default const {} ACE_INLINE -PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (PortableServer::_tao_seq_Policy_ptr p) +PortableServer::_tao_seq_Policy_var::_tao_seq_Policy_var (PortableServer::_tao_seq_Policy *p) : ptr_ (p) {} @@ -556,7 +473,7 @@ PortableServer::_tao_seq_Policy_var::operator PortableServer::_tao_seq_Policy &( return *this->ptr_; } -ACE_INLINE PortableServer::_tao_seq_Policy::TAO_ObjRefMngType +ACE_INLINE TAO_Object_Manager PortableServer::_tao_seq_Policy_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); @@ -660,7 +577,7 @@ PortableServer::_tao_seq_Policy_out::operator-> (void) return this->ptr_; } -ACE_INLINE PortableServer::_tao_seq_Policy::TAO_ObjRefMngType +ACE_INLINE TAO_Object_Manager PortableServer::_tao_seq_Policy_out::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); @@ -844,56 +761,6 @@ PortableServer::POA_out::operator-> (void) #endif // end #if !defined -#if !defined (_PORTABLESERVER__TAO_SEQ_OCTET_CI_) -#define _PORTABLESERVER__TAO_SEQ_OCTET_CI_ - -// ************************************************************* -// class PortableServer::_tao_seq_Octet -// ************************************************************* - -ACE_INLINE void -PortableServer::_tao_seq_Octet::freebuf (CORBA::Octet *seq) -{ - delete []seq; -} - -//default constructor -ACE_INLINE -PortableServer::_tao_seq_Octet::_tao_seq_Octet (void) - : maximum_ (0), - length_ (0), - buffer_ (0), - release_ (0) // does not own -{} - -ACE_INLINE CORBA::ULong -PortableServer::_tao_seq_Octet::maximum (void) const -{ - return this->maximum_; -} - -ACE_INLINE CORBA::ULong -PortableServer::_tao_seq_Octet::length (void) const -{ - return this->length_; -} - -ACE_INLINE CORBA::Octet & -PortableServer::_tao_seq_Octet::operator[] (CORBA::ULong index) // read/write -{ - return this->buffer_[index]; -} - -ACE_INLINE const CORBA::Octet & -PortableServer::_tao_seq_Octet::operator[] (CORBA::ULong index) const // read -{ - return this->buffer_[index]; -} - - -#endif // end #if !defined - - #if !defined (_PORTABLESERVER__TAO_SEQ_OCTET___VAR_CI_) #define _PORTABLESERVER__TAO_SEQ_OCTET___VAR_CI_ @@ -907,7 +774,7 @@ PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constru {} ACE_INLINE -PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (PortableServer::_tao_seq_Octet_ptr p) +PortableServer::_tao_seq_Octet_var::_tao_seq_Octet_var (PortableServer::_tao_seq_Octet *p) : ptr_ (p) {} @@ -975,7 +842,7 @@ PortableServer::_tao_seq_Octet_var::operator PortableServer::_tao_seq_Octet &() return *this->ptr_; } -ACE_INLINE CORBA::Octet & +ACE_INLINE CORBA::Octet & PortableServer::_tao_seq_Octet_var::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); @@ -1079,7 +946,7 @@ PortableServer::_tao_seq_Octet_out::operator-> (void) return this->ptr_; } -ACE_INLINE CORBA::Octet & +ACE_INLINE CORBA::Octet & PortableServer::_tao_seq_Octet_out::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); @@ -1106,18 +973,24 @@ PortableServer::ForwardRequest::~ForwardRequest (void) } ACE_INLINE -PortableServer::ThreadPolicy::ThreadPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::ThreadPolicy::ThreadPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::ThreadPolicy::ThreadPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::ThreadPolicy::~ThreadPolicy (void) // destructor {} +ACE_INLINE PortableServer::ThreadPolicy_ptr +PortableServer::ThreadPolicy::_nil (void) +{ + return (PortableServer::ThreadPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CI_) #define _PORTABLESERVER_THREADPOLICY___VAR_CI_ @@ -1293,18 +1166,24 @@ PortableServer::ThreadPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::LifespanPolicy::LifespanPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::LifespanPolicy::LifespanPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::LifespanPolicy::LifespanPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::LifespanPolicy::~LifespanPolicy (void) // destructor {} +ACE_INLINE PortableServer::LifespanPolicy_ptr +PortableServer::LifespanPolicy::_nil (void) +{ + return (PortableServer::LifespanPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CI_) #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CI_ @@ -1480,18 +1359,24 @@ PortableServer::LifespanPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::IdUniquenessPolicy::IdUniquenessPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void) // destructor {} +ACE_INLINE PortableServer::IdUniquenessPolicy_ptr +PortableServer::IdUniquenessPolicy::_nil (void) +{ + return (PortableServer::IdUniquenessPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_ @@ -1667,18 +1552,24 @@ PortableServer::IdUniquenessPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::IdAssignmentPolicy::IdAssignmentPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void) // destructor {} +ACE_INLINE PortableServer::IdAssignmentPolicy_ptr +PortableServer::IdAssignmentPolicy::_nil (void) +{ + return (PortableServer::IdAssignmentPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_ @@ -1854,18 +1745,24 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void) // destructor {} +ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr +PortableServer::ImplicitActivationPolicy::_nil (void) +{ + return (PortableServer::ImplicitActivationPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_ @@ -2041,18 +1938,24 @@ PortableServer::ImplicitActivationPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::ServantRetentionPolicy::ServantRetentionPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void) // destructor {} +ACE_INLINE PortableServer::ServantRetentionPolicy_ptr +PortableServer::ServantRetentionPolicy::_nil (void) +{ + return (PortableServer::ServantRetentionPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_ @@ -2228,18 +2131,24 @@ PortableServer::ServantRetentionPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) // default constructor -{} - -ACE_INLINE -PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::RequestProcessingPolicy::RequestProcessingPolicy( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void) // destructor {} +ACE_INLINE PortableServer::RequestProcessingPolicy_ptr +PortableServer::RequestProcessingPolicy::_nil (void) +{ + return (PortableServer::RequestProcessingPolicy_ptr)0; +} + #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_ @@ -2415,18 +2324,24 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::POAManager::POAManager (void) // default constructor -{} - -ACE_INLINE -PortableServer::POAManager::POAManager (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::POAManager::POAManager( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::POAManager::~POAManager (void) // destructor {} +ACE_INLINE PortableServer::POAManager_ptr +PortableServer::POAManager::_nil (void) +{ + return (PortableServer::POAManager_ptr)0; +} + #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CI_) #define _PORTABLESERVER_POAMANAGER___VAR_CI_ @@ -2619,18 +2534,24 @@ PortableServer::POAManager::AdapterInactive::~AdapterInactive (void) } ACE_INLINE -PortableServer::AdapterActivator::AdapterActivator (void) // default constructor -{} - -ACE_INLINE -PortableServer::AdapterActivator::AdapterActivator (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::AdapterActivator::AdapterActivator( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::AdapterActivator::~AdapterActivator (void) // destructor {} +ACE_INLINE PortableServer::AdapterActivator_ptr +PortableServer::AdapterActivator::_nil (void) +{ + return (PortableServer::AdapterActivator_ptr)0; +} + #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_) #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_ @@ -2806,18 +2727,24 @@ PortableServer::AdapterActivator_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::ServantManager::ServantManager (void) // default constructor -{} - -ACE_INLINE -PortableServer::ServantManager::ServantManager (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::ServantManager::ServantManager( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::ServantManager::~ServantManager (void) // destructor {} +ACE_INLINE PortableServer::ServantManager_ptr +PortableServer::ServantManager::_nil (void) +{ + return (PortableServer::ServantManager_ptr)0; +} + #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CI_) #define _PORTABLESERVER_SERVANTMANAGER___VAR_CI_ @@ -2993,18 +2920,24 @@ PortableServer::ServantManager_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::ServantActivator::ServantActivator (void) // default constructor -{} - -ACE_INLINE -PortableServer::ServantActivator::ServantActivator (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::ServantActivator::ServantActivator( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::ServantActivator::~ServantActivator (void) // destructor {} +ACE_INLINE PortableServer::ServantActivator_ptr +PortableServer::ServantActivator::_nil (void) +{ + return (PortableServer::ServantActivator_ptr)0; +} + #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_) #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_ @@ -3180,18 +3113,24 @@ PortableServer::ServantActivator_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::ServantLocator::ServantLocator (void) // default constructor -{} - -ACE_INLINE -PortableServer::ServantLocator::ServantLocator (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::ServantLocator::ServantLocator( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::ServantLocator::~ServantLocator (void) // destructor {} +ACE_INLINE PortableServer::ServantLocator_ptr +PortableServer::ServantLocator::_nil (void) +{ + return (PortableServer::ServantLocator_ptr)0; +} + #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CI_) #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CI_ @@ -3367,18 +3306,24 @@ PortableServer::ServantLocator_out::operator-> (void) #endif // end #if !defined ACE_INLINE -PortableServer::POA::POA (void) // default constructor -{} - -ACE_INLINE -PortableServer::POA::POA (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::POA::POA( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::POA::~POA (void) // destructor {} +ACE_INLINE PortableServer::POA_ptr +PortableServer::POA::_nil (void) +{ + return (PortableServer::POA_ptr)0; +} + #if !defined (_PORTABLESERVER_POA___VAR_CI_) #define _PORTABLESERVER_POA___VAR_CI_ @@ -3741,18 +3686,24 @@ PortableServer::POA::WrongPolicy::~WrongPolicy (void) } ACE_INLINE -PortableServer::Current::Current (void) // default constructor -{} - -ACE_INLINE -PortableServer::Current::Current (STUB_Object *objref) // constructor - : ACE_CORBA_1 (Object) (objref) +PortableServer::Current::Current( + STUB_Object *objref, + TAO_ServantBase *servant, + CORBA::Boolean collocated + ) + : ACE_CORBA_1 (Object) (objref, servant, collocated) {} ACE_INLINE PortableServer::Current::~Current (void) // destructor {} +ACE_INLINE PortableServer::Current_ptr +PortableServer::Current::_nil (void) +{ + return (PortableServer::Current_ptr)0; +} + #if !defined (_PORTABLESERVER_CURRENT___VAR_CI_) #define _PORTABLESERVER_CURRENT___VAR_CI_ diff --git a/TAO/tao/poaS.cpp b/TAO/tao/poaS.cpp index 6f11e709061..39b557bb83d 100644 --- a/TAO/tao/poaS.cpp +++ b/TAO/tao/poaS.cpp @@ -6,11 +6,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "tao/corba.h" - #include "poaS.h" #if !defined (__ACE_INLINE__) -#include "POAS.i" +#include "poaS.i" #endif // !defined INLINE static const TAO_operation_db_entry PortableServer_CurrentBase_operations [] = { @@ -21,30 +20,57 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_CurrentBase_optable (PortableServer_ // skeleton constructor POA_PortableServer::CurrentBase::CurrentBase (void) { + this->optable_ = &tao_PortableServer_CurrentBase_optable; } -void POA_PortableServer::CurrentBase::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::CurrentBase::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::CurrentBase_ptr impl = (POA_PortableServer::CurrentBase_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::CurrentBase::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::CurrentBase::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/CurrentBase:1.0") == 0) + return ACE_static_cast (POA_PortableServer::CurrentBase_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::CurrentBase::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -66,18 +92,12 @@ const char* POA_PortableServer::CurrentBase::_interface_repository_id (void) con return "IDL:PortableServer/CurrentBase:1.0"; } -void * -POA_PortableServer::CurrentBase::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_CurrentBase::_tao_collocated_CurrentBase ( POA_PortableServer::CurrentBase_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - CurrentBase (stub), + : CurrentBase (stub, servant, CORBA::B_TRUE), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -87,6 +107,17 @@ POA_PortableServer::CurrentBase_ptr POA_PortableServer::_tao_collocated_CurrentB return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_CurrentBase::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::CurrentBase* POA_PortableServer::CurrentBase::_this (CORBA_Environment &_env) @@ -107,6 +138,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_Policy_optable (PortableServer_Polic // skeleton constructor POA_PortableServer::Policy::Policy (void) { + this->optable_ = &tao_PortableServer_Policy_optable; } void POA_PortableServer::Policy::copy_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -142,28 +174,54 @@ void POA_PortableServer::Policy::destroy_skel (CORBA::ServerRequest &_tao_server } -void POA_PortableServer::Policy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::Policy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::Policy_ptr impl = (POA_PortableServer::Policy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::Policy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::Policy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::Policy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -185,18 +243,12 @@ const char* POA_PortableServer::Policy::_interface_repository_id (void) const return "IDL:PortableServer/Policy:1.0"; } -void * -POA_PortableServer::Policy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_Policy::_tao_collocated_Policy ( POA_PortableServer::Policy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - Policy (stub), + : Policy (stub, servant, CORBA::B_TRUE), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -206,6 +258,17 @@ POA_PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_Policy::_get_ return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_Policy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::Policy_ptr POA_PortableServer::_tao_collocated_Policy::copy ( CORBA::Environment &_tao_environment ) @@ -245,6 +308,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_ThreadPolicy_optable (PortableServer // skeleton constructor POA_PortableServer::ThreadPolicy::ThreadPolicy (void) { + this->optable_ = &tao_PortableServer_ThreadPolicy_optable; } void POA_PortableServer::ThreadPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -258,29 +322,57 @@ void POA_PortableServer::ThreadPolicy::_get_value_skel (CORBA::ServerRequest &_t _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::ThreadPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::ThreadPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::ThreadPolicy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::ThreadPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ThreadPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ThreadPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::ThreadPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -302,19 +394,13 @@ const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) co return "IDL:PortableServer/ThreadPolicy:1.0"; } -void * -POA_PortableServer::ThreadPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_ThreadPolicy::_tao_collocated_ThreadPolicy ( POA_PortableServer::ThreadPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - ThreadPolicy (stub), - _tao_collocated_Policy (servant, 0), + : ThreadPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -324,10 +410,23 @@ POA_PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_ThreadP return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_ThreadPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::ThreadPolicyValue -POA_PortableServer::_tao_collocated_ThreadPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_ThreadPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::ThreadPolicy* @@ -350,6 +449,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_LifespanPolicy_optable (PortableServ // skeleton constructor POA_PortableServer::LifespanPolicy::LifespanPolicy (void) { + this->optable_ = &tao_PortableServer_LifespanPolicy_optable; } void POA_PortableServer::LifespanPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -363,29 +463,57 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel (CORBA::ServerRequest & _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::LifespanPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::LifespanPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::LifespanPolicy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::LifespanPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/LifespanPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::LifespanPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::LifespanPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -407,19 +535,13 @@ const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) return "IDL:PortableServer/LifespanPolicy:1.0"; } -void * -POA_PortableServer::LifespanPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_LifespanPolicy::_tao_collocated_LifespanPolicy ( POA_PortableServer::LifespanPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - LifespanPolicy (stub), - _tao_collocated_Policy (servant, 0), + : LifespanPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -429,10 +551,23 @@ POA_PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_Lifes return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_LifespanPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::LifespanPolicyValue -POA_PortableServer::_tao_collocated_LifespanPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_LifespanPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::LifespanPolicy* @@ -455,6 +590,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable (Portable // skeleton constructor POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void) { + this->optable_ = &tao_PortableServer_IdUniquenessPolicy_optable; } void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -468,29 +604,57 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (CORBA::ServerReque _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::IdUniquenessPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::IdUniquenessPolicy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::IdUniquenessPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdUniquenessPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::IdUniquenessPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::IdUniquenessPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -512,19 +676,13 @@ const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (vo return "IDL:PortableServer/IdUniquenessPolicy:1.0"; } -void * -POA_PortableServer::IdUniquenessPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_tao_collocated_IdUniquenessPolicy ( POA_PortableServer::IdUniquenessPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - IdUniquenessPolicy (stub), - _tao_collocated_Policy (servant, 0), + : IdUniquenessPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -534,10 +692,23 @@ POA_PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_I return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::IdUniquenessPolicyValue -POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::IdUniquenessPolicy* @@ -560,6 +731,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable (Portable // skeleton constructor POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void) { + this->optable_ = &tao_PortableServer_IdAssignmentPolicy_optable; } void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -573,29 +745,57 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (CORBA::ServerReque _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::IdAssignmentPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::IdAssignmentPolicy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::IdAssignmentPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdAssignmentPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::IdAssignmentPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::IdAssignmentPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -617,19 +817,13 @@ const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (vo return "IDL:PortableServer/IdAssignmentPolicy:1.0"; } -void * -POA_PortableServer::IdAssignmentPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_tao_collocated_IdAssignmentPolicy ( POA_PortableServer::IdAssignmentPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - IdAssignmentPolicy (stub), - _tao_collocated_Policy (servant, 0), + : IdAssignmentPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -639,10 +833,23 @@ POA_PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_I return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::IdAssignmentPolicyValue -POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::IdAssignmentPolicy* @@ -665,6 +872,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable (Po // skeleton constructor POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) { + this->optable_ = &tao_PortableServer_ImplicitActivationPolicy_optable; } void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -678,29 +886,57 @@ void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (CORBA::Serve _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::ImplicitActivationPolicy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::ImplicitActivationPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ImplicitActivationPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ImplicitActivationPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::ImplicitActivationPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -722,19 +958,13 @@ const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_ return "IDL:PortableServer/ImplicitActivationPolicy:1.0"; } -void * -POA_PortableServer::ImplicitActivationPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_tao_collocated_ImplicitActivationPolicy ( POA_PortableServer::ImplicitActivationPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - ImplicitActivationPolicy (stub), - _tao_collocated_Policy (servant, 0), + : ImplicitActivationPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -744,10 +974,23 @@ POA_PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_colloc return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::ImplicitActivationPolicyValue -POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::ImplicitActivationPolicy* @@ -770,6 +1013,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable (Port // skeleton constructor POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) { + this->optable_ = &tao_PortableServer_ServantRetentionPolicy_optable; } void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -783,29 +1027,57 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (CORBA::ServerR _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::ServantRetentionPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::ServantRetentionPolicy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::ServantRetentionPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantRetentionPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ServantRetentionPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::ServantRetentionPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -827,19 +1099,13 @@ const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id return "IDL:PortableServer/ServantRetentionPolicy:1.0"; } -void * -POA_PortableServer::ServantRetentionPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_tao_collocated_ServantRetentionPolicy ( POA_PortableServer::ServantRetentionPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - ServantRetentionPolicy (stub), - _tao_collocated_Policy (servant, 0), + : ServantRetentionPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -849,10 +1115,23 @@ POA_PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocat return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::ServantRetentionPolicyValue -POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::ServantRetentionPolicy* @@ -875,6 +1154,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable (Por // skeleton constructor POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) { + this->optable_ = &tao_PortableServer_RequestProcessingPolicy_optable; } void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /*context*/, CORBA::Environment &_tao_environment) @@ -888,29 +1168,57 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (CORBA::Server _tao_server_request.result (result, _tao_environment); } -void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::RequestProcessingPolicy::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::RequestProcessingPolicy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::RequestProcessingPolicy::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/RequestProcessingPolicy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::RequestProcessingPolicy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Policy_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::RequestProcessingPolicy::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -932,19 +1240,13 @@ const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_i return "IDL:PortableServer/RequestProcessingPolicy:1.0"; } -void * -POA_PortableServer::RequestProcessingPolicy::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_tao_collocated_RequestProcessingPolicy ( POA_PortableServer::RequestProcessingPolicy_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - RequestProcessingPolicy (stub), - _tao_collocated_Policy (servant, 0), + : RequestProcessingPolicy (stub, servant, CORBA::B_TRUE), + _tao_collocated_Policy (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -954,10 +1256,23 @@ POA_PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_colloca return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::RequestProcessingPolicyValue -POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (CORBA::Environment &env) +POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->value (env); + return this->servant_->value(_tao_environment); } PortableServer::RequestProcessingPolicy* @@ -981,6 +1296,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_P // skeleton constructor POA_PortableServer::POAManager::POAManager (void) { + this->optable_ = &tao_PortableServer_POAManager_optable; } void POA_PortableServer::POAManager::activate_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -1050,28 +1366,54 @@ void POA_PortableServer::POAManager::deactivate_skel (CORBA::ServerRequest &_tao } -void POA_PortableServer::POAManager::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::POAManager::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::POAManager_ptr impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::POAManager::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::POAManager::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POAManager:1.0") == 0) + return ACE_static_cast (POA_PortableServer::POAManager_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::POAManager::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -1093,18 +1435,12 @@ const char* POA_PortableServer::POAManager::_interface_repository_id (void) cons return "IDL:PortableServer/POAManager:1.0"; } -void * -POA_PortableServer::POAManager::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_POAManager::_tao_collocated_POAManager ( POA_PortableServer::POAManager_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - POAManager (stub), + : POAManager (stub, servant, CORBA::B_TRUE), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -1114,6 +1450,17 @@ POA_PortableServer::POAManager_ptr POA_PortableServer::_tao_collocated_POAManage return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_POAManager::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + void POA_PortableServer::_tao_collocated_POAManager::activate ( CORBA::Environment &_tao_environment ) @@ -1177,6 +1524,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableSe // skeleton constructor POA_PortableServer::AdapterActivator::AdapterActivator (void) { + this->optable_ = &tao_PortableServer_AdapterActivator_optable; } void POA_PortableServer::AdapterActivator::unknown_adapter_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -1208,28 +1556,54 @@ void POA_PortableServer::AdapterActivator::unknown_adapter_skel (CORBA::ServerRe } -void POA_PortableServer::AdapterActivator::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::AdapterActivator::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::AdapterActivator_ptr impl = (POA_PortableServer::AdapterActivator_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::AdapterActivator::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::AdapterActivator::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/AdapterActivator:1.0") == 0) + return ACE_static_cast (POA_PortableServer::AdapterActivator_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::AdapterActivator::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -1251,18 +1625,12 @@ const char* POA_PortableServer::AdapterActivator::_interface_repository_id (void return "IDL:PortableServer/AdapterActivator:1.0"; } -void * -POA_PortableServer::AdapterActivator::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_AdapterActivator::_tao_collocated_AdapterActivator ( POA_PortableServer::AdapterActivator_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - AdapterActivator (stub), + : AdapterActivator (stub, servant, CORBA::B_TRUE), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -1272,6 +1640,17 @@ POA_PortableServer::AdapterActivator_ptr POA_PortableServer::_tao_collocated_Ada return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_adapter ( PortableServer::POA_ptr parent, const char* name, @@ -1303,30 +1682,57 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantManager_optable (PortableServ // skeleton constructor POA_PortableServer::ServantManager::ServantManager (void) { + this->optable_ = &tao_PortableServer_ServantManager_optable; } -void POA_PortableServer::ServantManager::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::ServantManager::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::ServantManager_ptr impl = (POA_PortableServer::ServantManager_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::ServantManager::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::ServantManager::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::ServantManager::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -1348,18 +1754,12 @@ const char* POA_PortableServer::ServantManager::_interface_repository_id (void) return "IDL:PortableServer/ServantManager:1.0"; } -void * -POA_PortableServer::ServantManager::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_ServantManager::_tao_collocated_ServantManager ( POA_PortableServer::ServantManager_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - ServantManager (stub), + : ServantManager (stub, servant, CORBA::B_TRUE), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -1369,6 +1769,17 @@ POA_PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_Serva return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::ServantManager* POA_PortableServer::ServantManager::_this (CORBA_Environment &_env) @@ -1389,6 +1800,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableSe // skeleton constructor POA_PortableServer::ServantActivator::ServantActivator (void) { + this->optable_ = &tao_PortableServer_ServantActivator_optable; } void POA_PortableServer::ServantActivator::incarnate_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -1403,29 +1815,57 @@ void POA_PortableServer::ServantActivator::etherealize_skel (CORBA::ServerReques _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); } -void POA_PortableServer::ServantActivator::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::ServantActivator::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::ServantActivator_ptr impl = (POA_PortableServer::ServantActivator_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::ServantActivator::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::ServantActivator::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantActivator:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ServantActivator_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::ServantActivator::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -1447,19 +1887,13 @@ const char* POA_PortableServer::ServantActivator::_interface_repository_id (void return "IDL:PortableServer/ServantActivator:1.0"; } -void * -POA_PortableServer::ServantActivator::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_ServantActivator::_tao_collocated_ServantActivator ( POA_PortableServer::ServantActivator_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - ServantActivator (stub), - _tao_collocated_ServantManager (servant, 0), + : ServantActivator (stub, servant, CORBA::B_TRUE), + _tao_collocated_ServantManager (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -1469,6 +1903,17 @@ POA_PortableServer::ServantActivator_ptr POA_PortableServer::_tao_collocated_Ser return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_ServantActivator::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::Servant POA_PortableServer::_tao_collocated_ServantActivator::incarnate ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, @@ -1521,6 +1966,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServ // skeleton constructor POA_PortableServer::ServantLocator::ServantLocator (void) { + this->optable_ = &tao_PortableServer_ServantLocator_optable; } void POA_PortableServer::ServantLocator::preinvoke_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -1535,29 +1981,57 @@ void POA_PortableServer::ServantLocator::postinvoke_skel (CORBA::ServerRequest & _tao_environment.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); } -void POA_PortableServer::ServantLocator::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::ServantLocator::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::ServantLocator_ptr impl = (POA_PortableServer::ServantLocator_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::ServantLocator::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::ServantLocator::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantLocator:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ServantLocator_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0) + return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::ServantLocator::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -1579,19 +2053,13 @@ const char* POA_PortableServer::ServantLocator::_interface_repository_id (void) return "IDL:PortableServer/ServantLocator:1.0"; } -void * -POA_PortableServer::ServantLocator::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_ServantLocator::_tao_collocated_ServantLocator ( POA_PortableServer::ServantLocator_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - ServantLocator (stub), - _tao_collocated_ServantManager (servant, 0), + : ServantLocator (stub, servant, CORBA::B_TRUE), + _tao_collocated_ServantManager (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -1601,6 +2069,17 @@ POA_PortableServer::ServantLocator_ptr POA_PortableServer::_tao_collocated_Serva return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_ServantLocator::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::preinvoke ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, @@ -1685,6 +2164,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_oper // skeleton constructor POA_PortableServer::POA::POA (void) { + this->optable_ = &tao_PortableServer_POA_optable; } void POA_PortableServer::POA::create_POA_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -2179,28 +2659,54 @@ void POA_PortableServer::POA::id_to_reference_skel (CORBA::ServerRequest &_tao_s } -void POA_PortableServer::POA::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::POA::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::POA_ptr impl = (POA_PortableServer::POA_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::POA::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::POA::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POA:1.0") == 0) + return ACE_static_cast (POA_PortableServer::POA_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::POA::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -2222,18 +2728,12 @@ const char* POA_PortableServer::POA::_interface_repository_id (void) const return "IDL:PortableServer/POA:1.0"; } -void * -POA_PortableServer::POA::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_POA::_tao_collocated_POA ( POA_PortableServer::POA_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - POA (stub), + : POA (stub, servant, CORBA::B_TRUE), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -2243,6 +2743,17 @@ POA_PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::_get_servan return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_POA::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::create_POA ( const char* adapter_name, PortableServer::POAManager_ptr a_POAManager, @@ -2361,34 +2872,44 @@ PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_ ); } -char * -POA_PortableServer::_tao_collocated_POA::the_name (CORBA::Environment &env) +char* +POA_PortableServer::_tao_collocated_POA::the_name ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->the_name (env); + return this->servant_->the_name(_tao_environment); } - -PortableServer::POA_ptr -POA_PortableServer::_tao_collocated_POA::the_parent (CORBA::Environment &env) +PortableServer::POA_ptr +POA_PortableServer::_tao_collocated_POA::the_parent ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->the_parent (env); + return this->servant_->the_parent(_tao_environment); } - -PortableServer::POAManager_ptr -POA_PortableServer::_tao_collocated_POA::the_POAManager (CORBA::Environment &env) +PortableServer::POAManager_ptr +POA_PortableServer::_tao_collocated_POA::the_POAManager ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->the_POAManager (env); + return this->servant_->the_POAManager(_tao_environment); } - -PortableServer::AdapterActivator_ptr -POA_PortableServer::_tao_collocated_POA::the_activator (CORBA::Environment &env) +PortableServer::AdapterActivator_ptr +POA_PortableServer::_tao_collocated_POA::the_activator ( + CORBA::Environment &_tao_environment + ) { - return this->servant_->the_activator (env); + return this->servant_->the_activator(_tao_environment); } -void -POA_PortableServer::_tao_collocated_POA::the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA::Environment &env) +void POA_PortableServer::_tao_collocated_POA::the_activator ( + PortableServer::AdapterActivator_ptr _tao_value, + CORBA::Environment &_tao_environment + ) { - this->servant_->the_activator(the_activator, env); + this->servant_->the_activator ( + _tao_value, + _tao_environment + ); } PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_POA::get_servant_manager ( @@ -2576,6 +3097,7 @@ TAO_Dynamic_Hash_OpTable tao_PortableServer_Current_optable (PortableServer_Curr // skeleton constructor POA_PortableServer::Current::Current (void) { + this->optable_ = &tao_PortableServer_Current_optable; } void POA_PortableServer::Current::get_POA_skel (CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void *context, CORBA::Environment &_tao_environment) @@ -2615,29 +3137,57 @@ void POA_PortableServer::Current::get_object_id_skel (CORBA::ServerRequest &_tao } -void POA_PortableServer::Current::_is_a_skel (CORBA::ServerRequest &req, void * /* obj */, void * /*context*/, CORBA::Environment &env) +void POA_PortableServer::Current::_is_a_skel ( + CORBA::ServerRequest &req, + void * _tao_object_reference, + void * /*context*/, + CORBA::Environment &_tao_environment + ) { CORBA::NVList_ptr nvlist; CORBA::NamedValue_ptr nv; CORBA::Any temp_value (CORBA::_tc_string); CORBA::Any *any; - CORBA::Boolean *retval; + CORBA::Boolean *retval = new CORBA::Boolean; CORBA::String value; req.orb()->create_list (0, nvlist); - nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env); - req.params (nvlist, env); // parse the args - if (env.exception () != 0) return; + nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, _tao_environment); + req.params (nvlist, _tao_environment); // parse the args + if (_tao_environment.exception () != 0) return; value = *(CORBA::String *)nv->value ()->value (); + POA_PortableServer::Current_ptr impl = (POA_PortableServer::Current_ptr) _tao_object_reference; + *retval = impl->_is_a (value, _tao_environment); + if (_tao_environment.exception () != 0) return; + any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); + req.result (any, _tao_environment); +} + +CORBA::Boolean POA_PortableServer::Current::_is_a ( + const char* value, + CORBA::Environment &_tao_environment + ) +{ if ( (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/CurrentBase:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) - retval = new CORBA::Boolean (CORBA::B_TRUE); - else - retval = new CORBA::Boolean (CORBA::B_FALSE); - any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE); - req.result (any, env); + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment)))) + return CORBA::B_TRUE; + else + return CORBA::B_FALSE; +} + +void* POA_PortableServer::Current::_downcast ( + const char* logical_type_id + ) +{ + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Current:1.0") == 0) + return ACE_static_cast (POA_PortableServer::Current_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/CurrentBase:1.0") == 0) + return ACE_static_cast (POA_PortableServer::CurrentBase_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); + return 0; } void POA_PortableServer::Current::dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env) @@ -2659,19 +3209,13 @@ const char* POA_PortableServer::Current::_interface_repository_id (void) const return "IDL:PortableServer/Current:1.0"; } -void * -POA_PortableServer::Current::_downcast (const char *repository_id) -{ - return this; -} - POA_PortableServer::_tao_collocated_Current::_tao_collocated_Current ( POA_PortableServer::Current_ptr servant, STUB_Object *stub ) - : CORBA_Object (stub, servant, CORBA::B_TRUE), - Current (stub), - _tao_collocated_CurrentBase (servant, 0), + : Current (stub, servant, CORBA::B_TRUE), + _tao_collocated_CurrentBase (servant, stub), + CORBA_Object (stub, servant, CORBA::B_TRUE), servant_ (servant) { } @@ -2681,6 +3225,17 @@ POA_PortableServer::Current_ptr POA_PortableServer::_tao_collocated_Current::_ge return this->servant_; } +CORBA::Boolean POA_PortableServer::_tao_collocated_Current::_is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment + ) +{ + return this->servant_->_is_a ( + logical_type_id, + _tao_environment + ); +} + PortableServer::POA_ptr POA_PortableServer::_tao_collocated_Current::get_POA ( CORBA::Environment &_tao_environment ) diff --git a/TAO/tao/poaS.h b/TAO/tao/poaS.h index d381c9859c1..31ce477b300 100644 --- a/TAO/tao/poaS.h +++ b/TAO/tao/poaS.h @@ -21,13 +21,18 @@ public: CurrentBase (void); public: virtual ~CurrentBase (void); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::CurrentBase *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -42,6 +47,10 @@ public: STUB_Object *stub ); CurrentBase_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); private: CurrentBase_ptr servant_; @@ -59,19 +68,24 @@ public: Policy (void); public: virtual ~Policy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment); + virtual void* _downcast ( + const char* logical_type_id + ); virtual PortableServer::Policy_ptr copy ( CORBA::Environment &env) = 0; // pure virtual static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); virtual void destroy ( CORBA::Environment &env) = 0; // pure virtual static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::Policy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -86,6 +100,10 @@ public: STUB_Object *stub ); Policy_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual PortableServer::Policy_ptr copy ( CORBA::Environment &_tao_environment ); @@ -109,10 +127,16 @@ public: ThreadPolicy (void); public: virtual ~ThreadPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -122,7 +146,6 @@ public: PortableServer::ThreadPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -138,7 +161,13 @@ public: STUB_Object *stub ); ThreadPolicy_ptr _get_servant (void) const; - virtual PortableServer::ThreadPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::ThreadPolicyValue value ( + CORBA::Environment &env + ); private: ThreadPolicy_ptr servant_; @@ -156,10 +185,16 @@ public: LifespanPolicy (void); public: virtual ~LifespanPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -169,7 +204,6 @@ public: PortableServer::LifespanPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -185,7 +219,13 @@ public: STUB_Object *stub ); LifespanPolicy_ptr _get_servant (void) const; - virtual PortableServer::LifespanPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::LifespanPolicyValue value ( + CORBA::Environment &env + ); private: LifespanPolicy_ptr servant_; @@ -203,10 +243,16 @@ public: IdUniquenessPolicy (void); public: virtual ~IdUniquenessPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -216,7 +262,6 @@ public: PortableServer::IdUniquenessPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -232,7 +277,13 @@ public: STUB_Object *stub ); IdUniquenessPolicy_ptr _get_servant (void) const; - virtual PortableServer::IdUniquenessPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::IdUniquenessPolicyValue value ( + CORBA::Environment &env + ); private: IdUniquenessPolicy_ptr servant_; @@ -250,10 +301,16 @@ public: IdAssignmentPolicy (void); public: virtual ~IdAssignmentPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -263,7 +320,6 @@ public: PortableServer::IdAssignmentPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -279,7 +335,13 @@ public: STUB_Object *stub ); IdAssignmentPolicy_ptr _get_servant (void) const; - virtual PortableServer::IdAssignmentPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::IdAssignmentPolicyValue value ( + CORBA::Environment &env + ); private: IdAssignmentPolicy_ptr servant_; @@ -297,10 +359,16 @@ public: ImplicitActivationPolicy (void); public: virtual ~ImplicitActivationPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -310,7 +378,6 @@ public: PortableServer::ImplicitActivationPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -326,7 +393,13 @@ public: STUB_Object *stub ); ImplicitActivationPolicy_ptr _get_servant (void) const; - virtual PortableServer::ImplicitActivationPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::ImplicitActivationPolicyValue value ( + CORBA::Environment &env + ); private: ImplicitActivationPolicy_ptr servant_; @@ -344,10 +417,16 @@ public: ServantRetentionPolicy (void); public: virtual ~ServantRetentionPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -357,7 +436,6 @@ public: PortableServer::ServantRetentionPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -373,7 +451,13 @@ public: STUB_Object *stub ); ServantRetentionPolicy_ptr _get_servant (void) const; - virtual PortableServer::ServantRetentionPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::ServantRetentionPolicyValue value ( + CORBA::Environment &env + ); private: ServantRetentionPolicy_ptr servant_; @@ -391,10 +475,16 @@ public: RequestProcessingPolicy (void); public: virtual ~RequestProcessingPolicy (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -404,7 +494,6 @@ public: PortableServer::RequestProcessingPolicy *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -420,7 +509,13 @@ public: STUB_Object *stub ); RequestProcessingPolicy_ptr _get_servant (void) const; - virtual PortableServer::RequestProcessingPolicyValue value (CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); + virtual PortableServer::RequestProcessingPolicyValue value ( + CORBA::Environment &env + ); private: RequestProcessingPolicy_ptr servant_; @@ -438,6 +533,12 @@ public: POAManager (void); public: virtual ~POAManager (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment); + virtual void* _downcast ( + const char* logical_type_id + ); virtual void activate ( CORBA::Environment &env) = 0; // pure virtual static void activate_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -450,13 +551,12 @@ public: virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &env) = 0; // pure virtual static void deactivate_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::POAManager *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -471,6 +571,10 @@ public: STUB_Object *stub ); POAManager_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual void activate ( CORBA::Environment &_tao_environment ); @@ -504,16 +608,21 @@ public: AdapterActivator (void); public: virtual ~AdapterActivator (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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 static void unknown_adapter_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::AdapterActivator *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -528,6 +637,10 @@ public: STUB_Object *stub ); AdapterActivator_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual CORBA::Boolean unknown_adapter ( PortableServer::POA_ptr parent, const char* name, @@ -550,13 +663,18 @@ public: ServantManager (void); public: virtual ~ServantManager (void); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::ServantManager *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -571,6 +689,10 @@ public: STUB_Object *stub ); ServantManager_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); private: ServantManager_ptr servant_; @@ -588,19 +710,24 @@ public: ServantActivator (void); public: virtual ~ServantActivator (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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 static void incarnate_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); 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 static void etherealize_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::ServantActivator *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -616,6 +743,10 @@ public: STUB_Object *stub ); ServantActivator_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, @@ -646,19 +777,24 @@ public: ServantLocator (void); public: virtual ~ServantLocator (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_environment); + virtual void* _downcast ( + const char* logical_type_id + ); virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, CORBA::Environment &env) = 0; // pure virtual static void preinvoke_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); 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 static void postinvoke_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::ServantLocator *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -674,6 +810,10 @@ public: STUB_Object *stub ); ServantLocator_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual PortableServer::Servant preinvoke ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, @@ -706,6 +846,12 @@ public: POA (void); public: virtual ~POA (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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 PortableServer::PolicyList &policies, CORBA::Environment &env) = 0; // pure virtual static void create_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); @@ -796,13 +942,12 @@ public: virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, CORBA::Environment &env) = 0; // pure virtual static void id_to_reference_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::POA *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -817,6 +962,10 @@ public: STUB_Object *stub ); POA_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual PortableServer::POA_ptr create_POA ( const char* adapter_name, PortableServer::POAManager_ptr a_POAManager, @@ -861,16 +1010,21 @@ public: PortableServer::RequestProcessingPolicyValue value, CORBA::Environment &_tao_environment ); - virtual char * the_name (CORBA::Environment &env); - - virtual PortableServer::POA_ptr the_parent (CORBA::Environment &env); - - virtual PortableServer::POAManager_ptr the_POAManager (CORBA::Environment &env); - - virtual PortableServer::AdapterActivator_ptr the_activator (CORBA::Environment &env); - - virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA::Environment &env); - + virtual char* the_name ( + CORBA::Environment &env + ); + virtual PortableServer::POA_ptr the_parent ( + CORBA::Environment &env + ); + virtual PortableServer::POAManager_ptr the_POAManager ( + CORBA::Environment &env + ); + virtual PortableServer::AdapterActivator_ptr the_activator ( + CORBA::Environment &env + ); + virtual void the_activator (PortableServer::AdapterActivator_ptr _tao_value, + CORBA::Environment &_tao_environment + ); virtual PortableServer::ServantManager_ptr get_servant_manager ( CORBA::Environment &_tao_environment ); @@ -948,19 +1102,24 @@ public: Current (void); public: virtual ~Current (void); + virtual CORBA::Boolean _is_a ( + const char* logical_type_id, + CORBA::Environment &_tao_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::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); - static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env); + static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &_tao_enviroment); virtual void dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env); PortableServer::Current *_this (CORBA::Environment &_tao_environment); virtual const char* _interface_repository_id (void) const; - virtual void *_downcast (const char *repository_id); }; @@ -976,6 +1135,10 @@ public: STUB_Object *stub ); Current_ptr _get_servant (void) const; + virtual CORBA::Boolean _is_a ( + const char *logical_type_id, + CORBA::Environment &_tao_environment + ); virtual PortableServer::POA_ptr get_POA ( CORBA::Environment &_tao_environment ); @@ -995,7 +1158,7 @@ public: #if defined (__ACE_INLINE__) -#include "POAS.i" +#include "poaS.i" #endif // defined INLINE diff --git a/TAO/tao/servant_base.cpp b/TAO/tao/servant_base.cpp index b2c029d307a..d1431c84c90 100644 --- a/TAO/tao/servant_base.cpp +++ b/TAO/tao/servant_base.cpp @@ -29,26 +29,15 @@ TAO_ServantBase::_default_POA (CORBA::Environment &env) CORBA::Boolean TAO_ServantBase::_is_a (const char* logical_type_id, - CORBA::Environment &) + CORBA::Environment &env) { - if (ACE_OS::strcmp (logical_type_id, CORBA::_tc_Object->id ()) == 0) + if (ACE_OS::strcmp (logical_type_id, CORBA::_tc_Object->id (env)) == 0) { return CORBA::B_TRUE; } return CORBA::B_FALSE; } - -void* -TAO_ServantBase::_downcast (const char* logical_type_id) -{ - if (ACE_OS::strcmp (logical_type_id, CORBA::_tc_Object->id ()) == 0) - { - return this; - } - return 0; -} - void TAO_ServantBase::set_parent (TAO_IUnknown *p) { diff --git a/TAO/tao/servant_base.h b/TAO/tao/servant_base.h index 2e415c34526..7411ebb62e5 100644 --- a/TAO/tao/servant_base.h +++ b/TAO/tao/servant_base.h @@ -55,7 +55,7 @@ public: virtual const char *_interface_repository_id (void) const = 0; // Get this interface's repository id - virtual void *_downcast (const char *repository_id); + virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable virtual STUB_Object *_create_stub (CORBA_Environment &_env); diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp index 7d5a265113d..b2183638efe 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.cpp +++ b/TAO/tests/POA/NewPOA/NewPOA.cpp @@ -6,7 +6,7 @@ main (int argc, char **argv) { CORBA::Environment env; - CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, 0, env); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env); if (env.exception () != 0) { env.print_exception ("CORBA::ORB_init"); @@ -65,15 +65,17 @@ main (int argc, char **argv) return -1; } - char *name = 0; + cout << rootPOA_name.in () << endl; + cout << childPOA_name.in () << endl; - name = rootPOA_name; - cout << name << endl; - - name = childPOA_name; - cout << name << endl; - - CORBA::release (orb); + childPOA->destroy (CORBA::B_TRUE, + CORBA::B_TRUE, + env); + if (env.exception () != 0) + { + env.print_exception ("PortableServer::POA::destroy"); + return -1; + } return 0; } diff --git a/TAO/tests/POA/NewPOA/NewPOA.dsp b/TAO/tests/POA/NewPOA/NewPOA.dsp index a1f92d6ab31..4562de8d25a 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.dsp +++ b/TAO/tests/POA/NewPOA/NewPOA.dsp @@ -72,7 +72,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 tao.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\\" +# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\\" # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp index e58951acdce..67c4073052b 100644 --- a/TAO/tests/POA/RootPOA/RootPOA.cpp +++ b/TAO/tests/POA/RootPOA/RootPOA.cpp @@ -6,7 +6,7 @@ main (int argc, char **argv) { CORBA::Environment env; - CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv, 0, env); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env); if (env.exception () != 0) { env.print_exception ("CORBA::ORB_init"); @@ -29,10 +29,7 @@ main (int argc, char **argv) return -1; } - char *name = poa_name; - cout << name << endl; - - CORBA::release (orb); + cout << poa_name.in () << endl; return 0; } -- cgit v1.2.1