diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-31 09:40:21 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-31 09:40:21 +0000 |
| commit | a76399c15be3d858fb4cb6311ef8513f21fc033a (patch) | |
| tree | 2661411cfdd12f2c5b6bf24e2d8872eefcc38ab9 | |
| parent | cbac77026f388098b634eda65e2a559fad61909e (diff) | |
| download | ATCD-a76399c15be3d858fb4cb6311ef8513f21fc033a.tar.gz | |
Brought in new IDL features.
| -rw-r--r-- | TAO/tao/POAC.cpp | 1321 | ||||
| -rw-r--r-- | TAO/tao/POAC.h | 343 | ||||
| -rw-r--r-- | TAO/tao/POAC.i | 789 | ||||
| -rw-r--r-- | TAO/tao/POAS.cpp | 2177 | ||||
| -rw-r--r-- | TAO/tao/POAS.h | 30 |
5 files changed, 3233 insertions, 1427 deletions
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index 73a862019a5..aaded494d34 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -16,7 +16,7 @@ #include "tao/POA.h" #include "tao/Typecode.h" #include "tao/Any.h" -#include "tao/Environment.h" +#include "tao/Invocation.h" #include "tao/Stub.h" #if !defined (__ACE_INLINE__) @@ -38,27 +38,33 @@ static const CORBA::Long _oc_PortableServer__tao_seq_Octet[] = static CORBA::TypeCode _tc_TAO_tc_PortableServer__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Octet), (char *) &_oc_PortableServer__tao_seq_Octet, 0, sizeof (PortableServer::_tao_seq_Octet)); -CORBA::TypeCode_ptr PortableServer::_tc__tao_seq_Octet = &_tc_TAO_tc_PortableServer__tao_seq_Octet; - +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc__tao_seq_Octet, &_tc_TAO_tc_PortableServer__tao_seq_Octet) +TAO_NAMESPACE_END #endif /* end #if !defined */ static const CORBA::Long _oc_PortableServer_ObjectId[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ObjectId:1.0 - 9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0xfdfdfd), // name = ObjectId + 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0 + 9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ObjectId CORBA::tk_sequence, // typecode kind 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, 0, }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof - (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId, - 0, sizeof (PortableServer::ObjectId)); -CORBA::TypeCode_ptr PortableServer::_tc_ObjectId = &_tc_TAO_tc_PortableServer_ObjectId; + (_oc_PortableServer_ObjectId), + (char *) &_oc_PortableServer_ObjectId, + 0, sizeof (PortableServer::ObjectId)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId) +TAO_NAMESPACE_END // default constructor PortableServer::ForwardRequest::ForwardRequest (void) @@ -103,7 +109,7 @@ void PortableServer::ForwardRequest::_raise (void) PortableServer::ForwardRequest_ptr PortableServer::ForwardRequest::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/ForwardRequest:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc); else return 0; @@ -124,7 +130,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_t _tao_any.replace (PortableServer::_tc_ForwardRequest, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -183,41 +189,46 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardR static const CORBA::Long _oc_PortableServer_ForwardRequest[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f46), ACE_NTOHL (0x6f727761), ACE_NTOHL (0x72645265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/ForwardRequest:1.0 - 15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x737400fd), // name = ForwardRequest + 46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f46), ACE_NTOHL (0x6f727761), ACE_NTOHL (0x72645265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/ForwardRequest:1.0 + 15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000), // name = ForwardRequest 1, // member count - 18, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x6172645f), ACE_NTOHL (0x72656665), ACE_NTOHL (0x72656e63), ACE_NTOHL (0x6500fdfd), // name = forward_reference - CORBA::tk_objref, - 44, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 21, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:CORBA/Object:1.0 - 7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x637400fd), // name = Object, + 18, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x6172645f), ACE_NTOHL (0x72656665), ACE_NTOHL (0x72656e63), ACE_NTOHL (0x65000000), // name = forward_reference + CORBA::tk_objref, +52, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0 + 7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000), // name = Object, }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (CORBA::tk_except, - sizeof - (_oc_PortableServer_ForwardRequest), - (char *) - &_oc_PortableServer_ForwardRequest, 0, - sizeof (PortableServer::ForwardRequest)); -CORBA::TypeCode_ptr PortableServer::_tc_ForwardRequest = &_tc_TAO_tc_PortableServer_ForwardRequest; - + sizeof (_oc_PortableServer_ForwardRequest), + (char *) &_oc_PortableServer_ForwardRequest, + 0, + sizeof (PortableServer::ForwardRequest)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableServer_ForwardRequest) +TAO_NAMESPACE_END #if !defined (TAO_HAS_MINIMUM_CORBA) static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0 - 18, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x6500fdfd), // name = ThreadPolicyValue + 49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:1.0 + 18, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = ThreadPolicyValue 2, // member count - 15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c00fd), // name = ORB_CTRL_MODEL - 20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00), // name = SINGLE_THREAD_MODEL + 15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c0000), // name = ORB_CTRL_MODEL + 20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00), // name = SINGLE_THREAD_MODEL }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_ThreadPolicyValue), (char *) - &_oc_PortableServer_ThreadPolicyValue, 0, - sizeof (PortableServer::ThreadPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicyValue = &_tc_TAO_tc_PortableServer_ThreadPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_ThreadPolicyValue), + (char *) &_oc_PortableServer_ThreadPolicyValue, + 0, + sizeof (PortableServer::ThreadPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicyValue, &_tc_TAO_tc_PortableServer_ThreadPolicyValue) +TAO_NAMESPACE_END PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (PortableServer::ThreadPolicy_ptr obj) { @@ -234,84 +245,118 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( { if (CORBA::is_nil (obj)) return PortableServer::ThreadPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ThreadPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", env)) return PortableServer::ThreadPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::ThreadPolicy(stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ThreadPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ThreadPolicy:1.0"); + if (servant == 0) + return new PortableServer::ThreadPolicy(stub); return new POA_PortableServer::_tao_collocated_ThreadPolicy( - ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant), + stub + ); } -PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &env) +PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] = + PortableServer::ThreadPolicyValue _tao_retval = (PortableServer::ThreadPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_ThreadPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::ThreadPolicyValue retval = - ACE_static_cast (PortableServer::ThreadPolicyValue, -1); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, - &_get_PortableServer_ThreadPolicy_value_calldata, - _tao_arguments); - return retval; + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (! (_tao_in >> _tao_retval)) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/ThreadPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/ThreadPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_ThreadPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ThreadPolicy:1.0 - 13, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd), // name = ThreadPolicy, + 44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:1.0 + 13, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ThreadPolicy, }; + static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (CORBA::tk_objref, - sizeof - (_oc_PortableServer_ThreadPolicy), - (char *) - &_oc_PortableServer_ThreadPolicy, 0, - sizeof (PortableServer::ThreadPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicy = &_tc_TAO_tc_PortableServer_ThreadPolicy; + sizeof (_oc_PortableServer_ThreadPolicy), + (char *) &_oc_PortableServer_ThreadPolicy, + 0, + sizeof (PortableServer::ThreadPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicy, &_tc_TAO_tc_PortableServer_ThreadPolicy) +TAO_NAMESPACE_END #endif /* TAO_HAS_MINIMUM_CORBA */ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0 + 51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:1.0 20, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = LifespanPolicyValue 2, // member count - 10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x5400fdfd), // name = TRANSIENT - 11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e5400fd), // name = PERSISTENT + 10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x54000000), // name = TRANSIENT + 11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e540000), // name = PERSISTENT }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *) - &_oc_PortableServer_LifespanPolicyValue, 0, -sizeof (PortableServer::LifespanPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicyValue = &_tc_TAO_tc_PortableServer_LifespanPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_LifespanPolicyValue), + (char *) &_oc_PortableServer_LifespanPolicyValue, + 0, + sizeof (PortableServer::LifespanPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicyValue, &_tc_TAO_tc_PortableServer_LifespanPolicyValue) +TAO_NAMESPACE_END PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (PortableServer::LifespanPolicy_ptr obj) { @@ -328,85 +373,118 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( { if (CORBA::is_nil (obj)) return PortableServer::LifespanPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/LifespanPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/LifespanPolicy:1.0", env)) return PortableServer::LifespanPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::LifespanPolicy (stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/LifespanPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/LifespanPolicy:1.0"); + if (servant == 0) + return new PortableServer::LifespanPolicy(stub); return new POA_PortableServer::_tao_collocated_LifespanPolicy( - ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant), + stub + ); } -PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &env) +PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] = + PortableServer::LifespanPolicyValue _tao_retval = (PortableServer::LifespanPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_LifespanPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::LifespanPolicyValue retval = - ACE_static_cast (PortableServer::LifespanPolicyValue, -1); + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, - &_get_PortableServer_LifespanPolicy_value_calldata, - _tao_arguments); - return retval; + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/LifespanPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/LifespanPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_LifespanPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/LifespanPolicy:1.0 - 15, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd), // name = LifespanPolicy, + 46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:1.0 + 15, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = LifespanPolicy, }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (CORBA::tk_objref, - sizeof - (_oc_PortableServer_LifespanPolicy), - (char *) - &_oc_PortableServer_LifespanPolicy, - 0, - sizeof (PortableServer::LifespanPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicy = &_tc_TAO_tc_PortableServer_LifespanPolicy; + sizeof (_oc_PortableServer_LifespanPolicy), + (char *) &_oc_PortableServer_LifespanPolicy, + 0, + sizeof (PortableServer::LifespanPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicy, &_tc_TAO_tc_PortableServer_LifespanPolicy) +TAO_NAMESPACE_END static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0 + 55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:1.0 24, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = IdUniquenessPolicyValue 2, // member count - 10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x4400fdfd), // name = UNIQUE_ID - 12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400), // name = MULTIPLE_ID + 10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x44000000), // name = UNIQUE_ID + 12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400), // name = MULTIPLE_ID }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_IdUniquenessPolicyValue), (char *) - &_oc_PortableServer_IdUniquenessPolicyValue, 0, sizeof - (PortableServer::IdUniquenessPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicyValue = &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_IdUniquenessPolicyValue), + (char *) &_oc_PortableServer_IdUniquenessPolicyValue, + 0, + sizeof (PortableServer::IdUniquenessPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicyValue, &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue) +TAO_NAMESPACE_END PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_duplicate (PortableServer::IdUniquenessPolicy_ptr obj) { @@ -423,80 +501,117 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr { if (CORBA::is_nil (obj)) return PortableServer::IdUniquenessPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/IdUniquenessPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0", env)) return PortableServer::IdUniquenessPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::IdUniquenessPolicy (stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdUniquenessPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0"); + if (servant == 0) + return new PortableServer::IdUniquenessPolicy(stub); return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy( - ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant), + stub + ); } -PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &env) +PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] = + PortableServer::IdUniquenessPolicyValue _tao_retval = (PortableServer::IdUniquenessPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::IdUniquenessPolicyValue retval = - ACE_static_cast (PortableServer::IdUniquenessPolicyValue, -1); + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, &_get_PortableServer_IdUniquenessPolicy_value_calldata, _tao_arguments); - return retval; + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/IdUniquenessPolicy:1.0 - 19, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd), // name = IdUniquenessPolicy, + 50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0 + 19, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = IdUniquenessPolicy, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy -(CORBA::tk_objref, sizeof (_oc_PortableServer_IdUniquenessPolicy), (char *) - &_oc_PortableServer_IdUniquenessPolicy, 0, - sizeof (PortableServer::IdUniquenessPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicy = &_tc_TAO_tc_PortableServer_IdUniquenessPolicy; - +static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (CORBA::tk_objref, + sizeof (_oc_PortableServer_IdUniquenessPolicy), + (char *) &_oc_PortableServer_IdUniquenessPolicy, + 0, + sizeof (PortableServer::IdUniquenessPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicy, &_tc_TAO_tc_PortableServer_IdUniquenessPolicy) +TAO_NAMESPACE_END static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0 + 55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:1.0 24, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = IdAssignmentPolicyValue 2, // member count - 8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400), // name = USER_ID - 10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x4400fdfd), // name = SYSTEM_ID + 8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400), // name = USER_ID + 10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x44000000), // name = SYSTEM_ID }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_IdAssignmentPolicyValue), (char *) - &_oc_PortableServer_IdAssignmentPolicyValue, 0, - sizeof (PortableServer::IdAssignmentPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicyValue = &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_IdAssignmentPolicyValue), + (char *) &_oc_PortableServer_IdAssignmentPolicyValue, + 0, + sizeof (PortableServer::IdAssignmentPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicyValue, &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue) +TAO_NAMESPACE_END PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_duplicate (PortableServer::IdAssignmentPolicy_ptr obj) { @@ -513,65 +628,98 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr { if (CORBA::is_nil (obj)) return PortableServer::IdAssignmentPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/IdAssignmentPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0", env)) return PortableServer::IdAssignmentPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::IdAssignmentPolicy (stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdAssignmentPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0"); + if (servant == 0) + return new PortableServer::IdAssignmentPolicy(stub); return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy( - ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant), + stub + ); } -PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &env) +PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] = + PortableServer::IdAssignmentPolicyValue _tao_retval = (PortableServer::IdAssignmentPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::IdAssignmentPolicyValue retval = - ACE_static_cast (PortableServer::IdAssignmentPolicyValue, -1); + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, &_get_PortableServer_IdAssignmentPolicy_value_calldata, _tao_arguments); - return retval; + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/IdAssignmentPolicy:1.0 - 19, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd), // name = IdAssignmentPolicy, + 50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0 + 19, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = IdAssignmentPolicy, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy -(CORBA::tk_objref, sizeof (_oc_PortableServer_IdAssignmentPolicy), (char *) - &_oc_PortableServer_IdAssignmentPolicy, - 0, - sizeof (PortableServer::IdAssignmentPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicy = &_tc_TAO_tc_PortableServer_IdAssignmentPolicy; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (CORBA::tk_objref, + sizeof (_oc_PortableServer_IdAssignmentPolicy), + (char *) &_oc_PortableServer_IdAssignmentPolicy, + 0, + sizeof (PortableServer::IdAssignmentPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicy, &_tc_TAO_tc_PortableServer_IdAssignmentPolicy) +TAO_NAMESPACE_END #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -579,17 +727,21 @@ CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicy = &_tc_TAO_tc_Portabl static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 53, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0 - 30, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x6500fdfd), // name = ImplicitActivationPolicyValue + 61, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:1.0 + 30, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = ImplicitActivationPolicyValue 2, // member count - 20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00), // name = IMPLICIT_ACTIVATION - 23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e00fd), // name = NO_IMPLICIT_ACTIVATION + 20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00), // name = IMPLICIT_ACTIVATION + 23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e0000), // name = NO_IMPLICIT_ACTIVATION }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue), - (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0, - sizeof (PortableServer::ImplicitActivationPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicyValue = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_ImplicitActivationPolicyValue), + (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, + 0, + sizeof (PortableServer::ImplicitActivationPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicyValue, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue) +TAO_NAMESPACE_END PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_duplicate (PortableServer::ImplicitActivationPolicy_ptr obj) { @@ -606,80 +758,118 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP { if (CORBA::is_nil (obj)) return PortableServer::ImplicitActivationPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ImplicitActivationPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0", env)) return PortableServer::ImplicitActivationPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::ImplicitActivationPolicy (stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ImplicitActivationPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0"); + if (servant == 0) + return new PortableServer::ImplicitActivationPolicy(stub); return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy( - ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant), + stub + ); } -PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &env) +PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] = + PortableServer::ImplicitActivationPolicyValue _tao_retval = (PortableServer::ImplicitActivationPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::ImplicitActivationPolicyValue retval = - ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, -1); + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, &_get_PortableServer_ImplicitActivationPolicy_value_calldata, _tao_arguments); - return retval; + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ImplicitActivationPolicy:1.0 - 25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd), // name = ImplicitActivationPolicy, + 56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0 + 25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0), // name = ImplicitActivationPolicy, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy -(CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy), - (char *)&_oc_PortableServer_ImplicitActivationPolicy, 0, - sizeof (PortableServer::ImplicitActivationPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicy = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (CORBA::tk_objref, + sizeof (_oc_PortableServer_ImplicitActivationPolicy), + (char *) &_oc_PortableServer_ImplicitActivationPolicy, + 0, + sizeof (PortableServer::ImplicitActivationPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicy, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy) +TAO_NAMESPACE_END static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0 + 59, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:1.0 28, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500), // name = ServantRetentionPolicyValue 2, // member count - 7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd), // name = RETAIN - 11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd), // name = NON_RETAIN + 7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000), // name = RETAIN + 11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000), // name = NON_RETAIN }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue), - (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0, - sizeof (PortableServer::ServantRetentionPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicyValue = &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_ServantRetentionPolicyValue), + (char *) &_oc_PortableServer_ServantRetentionPolicyValue, + 0, + sizeof (PortableServer::ServantRetentionPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicyValue, &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue) +TAO_NAMESPACE_END PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (PortableServer::ServantRetentionPolicy_ptr obj) { @@ -696,81 +886,118 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic { if (CORBA::is_nil (obj)) return PortableServer::ServantRetentionPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantRetentionPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0", env)) return PortableServer::ServantRetentionPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::ServantRetentionPolicy (stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantRetentionPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0"); + if (servant == 0) + return new PortableServer::ServantRetentionPolicy(stub); return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy( - ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant), + stub + ); } -PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &env) +PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] = + PortableServer::ServantRetentionPolicyValue _tao_retval = (PortableServer::ServantRetentionPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::ServantRetentionPolicyValue retval = - ACE_static_cast (PortableServer::ServantRetentionPolicyValue, -1); + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, &_get_PortableServer_ServantRetentionPolicy_value_calldata, _tao_arguments); - return retval; + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/ServantRetentionPolicy:1.0 - 23, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd), // name = ServantRetentionPolicy, + 54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0 + 23, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = ServantRetentionPolicy, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy -(CORBA::tk_objref, sizeof (_oc_PortableServer_ServantRetentionPolicy), (char *) - &_oc_PortableServer_ServantRetentionPolicy, 0, sizeof - (PortableServer::ServantRetentionPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicy = &_tc_TAO_tc_PortableServer_ServantRetentionPolicy; - +static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (CORBA::tk_objref, + sizeof (_oc_PortableServer_ServantRetentionPolicy), + (char *) &_oc_PortableServer_ServantRetentionPolicy, + 0, + sizeof (PortableServer::ServantRetentionPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicy, &_tc_TAO_tc_PortableServer_ServantRetentionPolicy) +TAO_NAMESPACE_END static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0 - 29, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0xfdfdfd), // name = RequestProcessingPolicyValue + 60, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:1.0 + 29, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = RequestProcessingPolicyValue 3, // member count - 27, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56455f4f), ACE_NTOHL (0x424a4543), ACE_NTOHL (0x545f4d41), ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c5900fd), // name = USE_ACTIVE_OBJECT_MAP_ONLY - 20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400), // name = USE_DEFAULT_SERVANT - 20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200), // name = USE_SERVANT_MANAGER + 27, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56455f4f), ACE_NTOHL (0x424a4543), ACE_NTOHL (0x545f4d41), ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c590000), // name = USE_ACTIVE_OBJECT_MAP_ONLY + 20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400), // name = USE_DEFAULT_SERVANT + 20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200), // name = USE_SERVANT_MANAGER }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue -(CORBA::tk_enum, sizeof (_oc_PortableServer_RequestProcessingPolicyValue), - (char *) &_oc_PortableServer_RequestProcessingPolicyValue, 0, sizeof - (PortableServer::RequestProcessingPolicyValue)); -CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicyValue = &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (CORBA::tk_enum, + sizeof (_oc_PortableServer_RequestProcessingPolicyValue), + (char *) &_oc_PortableServer_RequestProcessingPolicyValue, + 0, + sizeof (PortableServer::RequestProcessingPolicyValue)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicyValue, &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue) +TAO_NAMESPACE_END PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_duplicate (PortableServer::RequestProcessingPolicy_ptr obj) { @@ -787,64 +1014,98 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol { if (CORBA::is_nil (obj)) return PortableServer::RequestProcessingPolicy::_nil (); - if (!obj->_is_a ("IDL:PortableServer/RequestProcessingPolicy:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0", env)) return PortableServer::RequestProcessingPolicy::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - return new PortableServer::RequestProcessingPolicy (stub); - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/RequestProcessingPolicy:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0"); + if (servant == 0) + return new PortableServer::RequestProcessingPolicy(stub); return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy( - ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant), + stub + ); } -PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &env) +PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] = + PortableServer::RequestProcessingPolicyValue _tao_retval = (PortableServer::RequestProcessingPolicyValue)0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + + + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "_get_""value", + TAO_ORB_Core_instance () + ); + + + for (;;) { - {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_RETURN, 0}}; + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata, 0, 0}; + int _invoke_status = + _tao_call.invoke (0, 0, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); - PortableServer::RequestProcessingPolicyValue retval = - ACE_static_cast (PortableServer::RequestProcessingPolicyValue, -1); + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, &_get_PortableServer_RequestProcessingPolicy_value_calldata, _tao_arguments); - return retval; + } + break; + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> _tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0"; +} + static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/RequestProcessingPolicy:1.0 + 55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0 24, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900), // name = RequestProcessingPolicy, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy -(CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy), - (char *) &_oc_PortableServer_RequestProcessingPolicy, 0, sizeof - (PortableServer::RequestProcessingPolicy)); -CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicy = &_tc_TAO_tc_PortableServer_RequestProcessingPolicy; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (CORBA::tk_objref, + sizeof (_oc_PortableServer_RequestProcessingPolicy), + (char *) &_oc_PortableServer_RequestProcessingPolicy, + 0, + sizeof (PortableServer::RequestProcessingPolicy)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicy, &_tc_TAO_tc_PortableServer_RequestProcessingPolicy) +TAO_NAMESPACE_END #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -858,23 +1119,20 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableS PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::POAManager::_nil (); - if (!obj->_is_a ("IDL:PortableServer/POAManager:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/POAManager:1.0", ACE_TRY_ENV)) return PortableServer::POAManager::_nil (); if (!obj->_is_collocated () || !obj->_servant()) - { // This can only be colocated - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::POAManager::_nil (); - } // end of if + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POAManager::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POAManager:1.0"); + void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/POAManager:1.0"); return new POA_PortableServer::_tao_collocated_POAManager( ACE_reinterpret_cast(POA_PortableServer::POAManager_ptr, servant), stub @@ -915,7 +1173,7 @@ void PortableServer::POAManager::AdapterInactive::_raise (void) PortableServer::POAManager::AdapterInactive_ptr PortableServer::POAManager::AdapterInactive::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc); else return 0; @@ -936,7 +1194,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POAManager::Adapte _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -995,7 +1253,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManag static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x722f4164), ACE_NTOHL (0x61707465), ACE_NTOHL (0x72496e61), ACE_NTOHL (0x63746976), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/POAManager/AdapterInactive:1.0 + 58, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x722f4164), ACE_NTOHL (0x61707465), ACE_NTOHL (0x72496e61), ACE_NTOHL (0x63746976), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0 16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500), // name = AdapterInactive 0, // member count }; @@ -1008,26 +1266,33 @@ CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc_TAO_t 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, "IDL:omg.org/PortableServer/POAManager:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::POAManager::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/POAManager:1.0"; +} + static const CORBA::Long _oc_PortableServer_POAManager[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/POAManager:1.0 - 11, ACE_NTOHL (0x504f414d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x657200fd), // name = POAManager, + 42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/POAManager:1.0 + 11, ACE_NTOHL (0x504f414d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x65720000), // name = POAManager, }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (CORBA::tk_objref, - sizeof - (_oc_PortableServer_POAManager), - (char *) - &_oc_PortableServer_POAManager, 0, - sizeof (PortableServer::POAManager)); -CORBA::TypeCode_ptr PortableServer::_tc_POAManager = &_tc_TAO_tc_PortableServer_POAManager; + sizeof (_oc_PortableServer_POAManager), + (char *) &_oc_PortableServer_POAManager, + 0, + sizeof (PortableServer::POAManager)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_POAManager, &_tc_TAO_tc_PortableServer_POAManager) +TAO_NAMESPACE_END #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -1041,23 +1306,20 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicat PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::AdapterActivator::_nil (); - if (!obj->_is_a ("IDL:PortableServer/AdapterActivator:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/AdapterActivator:1.0", ACE_TRY_ENV)) return PortableServer::AdapterActivator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) - { // This can only be colocated - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::AdapterActivator::_nil (); - } // end of if + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::AdapterActivator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/AdapterActivator:1.0"); + void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/AdapterActivator:1.0"); return new POA_PortableServer::_tao_collocated_AdapterActivator( ACE_reinterpret_cast(POA_PortableServer::AdapterActivator_ptr, servant), stub @@ -1067,24 +1329,33 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( 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, "IDL:omg.org/PortableServer/AdapterActivator:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::AdapterActivator::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/AdapterActivator:1.0"; +} + static const CORBA::Long _oc_PortableServer_AdapterActivator[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/AdapterActivator:1.0 - 17, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0xfdfdfd), // name = AdapterActivator, + 48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/AdapterActivator:1.0 + 17, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0x0), // name = AdapterActivator, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator -(CORBA::tk_objref, sizeof (_oc_PortableServer_AdapterActivator), (char *) - &_oc_PortableServer_AdapterActivator, 0, sizeof - (PortableServer::AdapterActivator)); -CORBA::TypeCode_ptr PortableServer::_tc_AdapterActivator = &_tc_TAO_tc_PortableServer_AdapterActivator; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (CORBA::tk_objref, + sizeof (_oc_PortableServer_AdapterActivator), + (char *) &_oc_PortableServer_AdapterActivator, + 0, + sizeof (PortableServer::AdapterActivator)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AdapterActivator, &_tc_TAO_tc_PortableServer_AdapterActivator) +TAO_NAMESPACE_END PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (PortableServer::ServantManager_ptr obj) { @@ -1096,23 +1367,20 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (P PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::ServantManager::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantManager:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantManager:1.0", ACE_TRY_ENV)) return PortableServer::ServantManager::_nil (); if (!obj->_is_collocated () || !obj->_servant()) - { - // This can only be colocated - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::ServantManager::_nil (); - } // end of if + // This can only be colocated + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantManager::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantManager:1.0"); + void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantManager:1.0"); return new POA_PortableServer::_tao_collocated_ServantManager( ACE_reinterpret_cast(POA_PortableServer::ServantManager_ptr, servant), stub @@ -1122,27 +1390,33 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( 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, "IDL:omg.org/PortableServer/ServantManager:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::ServantManager::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/ServantManager:1.0"; +} + static const CORBA::Long _oc_PortableServer_ServantManager[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/ServantManager:1.0 - 15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x657200fd), // name = ServantManager, + 46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/ServantManager:1.0 + 15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x65720000), // name = ServantManager, }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (CORBA::tk_objref, - sizeof - (_oc_PortableServer_ServantManager), - (char *) - &_oc_PortableServer_ServantManager, - 0, - sizeof (PortableServer::ServantManager)); -CORBA::TypeCode_ptr PortableServer::_tc_ServantManager = &_tc_TAO_tc_PortableServer_ServantManager; + sizeof (_oc_PortableServer_ServantManager), + (char *) &_oc_PortableServer_ServantManager, + 0, + sizeof (PortableServer::ServantManager)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantManager, &_tc_TAO_tc_PortableServer_ServantManager) +TAO_NAMESPACE_END PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicate (PortableServer::ServantActivator_ptr obj) { @@ -1154,23 +1428,20 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicat PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::ServantActivator::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantActivator:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantActivator:1.0", ACE_TRY_ENV)) return PortableServer::ServantActivator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) - { // This can only be colocated - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::ServantActivator::_nil (); - } // end of if + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantActivator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantActivator:1.0"); + void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantActivator:1.0"); return new POA_PortableServer::_tao_collocated_ServantActivator( ACE_reinterpret_cast(POA_PortableServer::ServantActivator_ptr, servant), stub @@ -1180,25 +1451,34 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( 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, "IDL:omg.org/PortableServer/ServantActivator:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::ServantActivator::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/ServantActivator:1.0"; +} + static const CORBA::Long _oc_PortableServer_ServantActivator[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ServantActivator:1.0 - 17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0xfdfdfd), // name = ServantActivator, + 48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/ServantActivator:1.0 + 17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0x0), // name = ServantActivator, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator -(CORBA::tk_objref, sizeof (_oc_PortableServer_ServantActivator), (char *) - &_oc_PortableServer_ServantActivator, 0, sizeof - (PortableServer::ServantActivator)); -CORBA::TypeCode_ptr PortableServer::_tc_ServantActivator = &_tc_TAO_tc_PortableServer_ServantActivator; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (CORBA::tk_objref, + sizeof (_oc_PortableServer_ServantActivator), + (char *) &_oc_PortableServer_ServantActivator, + 0, + sizeof (PortableServer::ServantActivator)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantActivator, &_tc_TAO_tc_PortableServer_ServantActivator) +TAO_NAMESPACE_END PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (PortableServer::ServantLocator_ptr obj) { @@ -1210,23 +1490,20 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (P PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::ServantLocator::_nil (); - if (!obj->_is_a ("IDL:PortableServer/ServantLocator:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantLocator:1.0", ACE_TRY_ENV)) return PortableServer::ServantLocator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) - { - // This can only be colocated - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::ServantLocator::_nil (); - } // end of if + // This can only be colocated + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantLocator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantLocator:1.0"); + void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantLocator:1.0"); return new POA_PortableServer::_tao_collocated_ServantLocator( ACE_reinterpret_cast(POA_PortableServer::ServantLocator_ptr, servant), stub @@ -1236,28 +1513,34 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( 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, "IDL:omg.org/PortableServer/ServantLocator:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::ServantLocator::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/ServantLocator:1.0"; +} + static const CORBA::Long _oc_PortableServer_ServantLocator[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744c6f), ACE_NTOHL (0x6361746f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/ServantLocator:1.0 - 15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744c), ACE_NTOHL (0x6f636174), ACE_NTOHL (0x6f7200fd), // name = ServantLocator, + 46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744c6f), ACE_NTOHL (0x6361746f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/ServantLocator:1.0 + 15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744c), ACE_NTOHL (0x6f636174), ACE_NTOHL (0x6f720000), // name = ServantLocator, }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (CORBA::tk_objref, - sizeof - (_oc_PortableServer_ServantLocator), - (char *) - &_oc_PortableServer_ServantLocator, - 0, - sizeof (PortableServer::ServantLocator)); -CORBA::TypeCode_ptr PortableServer::_tc_ServantLocator = &_tc_TAO_tc_PortableServer_ServantLocator; + sizeof (_oc_PortableServer_ServantLocator), + (char *) &_oc_PortableServer_ServantLocator, + 0, + sizeof (PortableServer::ServantLocator)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantLocator, &_tc_TAO_tc_PortableServer_ServantLocator) +TAO_NAMESPACE_END #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -1271,23 +1554,20 @@ PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr PortableServer::POA_ptr PortableServer::POA::_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &env + CORBA::Environment &ACE_TRY_ENV ) { if (CORBA::is_nil (obj)) return PortableServer::POA::_nil (); - if (!obj->_is_a ("IDL:PortableServer/POA:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/POA:1.0", ACE_TRY_ENV)) return PortableServer::POA::_nil (); if (!obj->_is_collocated () || !obj->_servant()) - { - // This can only be colocated - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::POA::_nil (); - } // end of if + // This can only be colocated + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POA:1.0"); + void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/POA:1.0"); return new POA_PortableServer::_tao_collocated_POA( ACE_reinterpret_cast(POA_PortableServer::POA_ptr, servant), stub @@ -1328,7 +1608,7 @@ void PortableServer::POA::AdapterAlreadyExists::_raise (void) PortableServer::POA::AdapterAlreadyExists_ptr PortableServer::POA::AdapterAlreadyExists::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::AdapterAlreadyExists_ptr, exc); else return 0; @@ -1349,7 +1629,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterAlread _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -1408,8 +1688,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79457869), ACE_NTOHL (0x7374733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/POA/AdapterAlreadyExists:1.0 - 21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0xfdfdfd), // name = AdapterAlreadyExists + 56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79457869), ACE_NTOHL (0x7374733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0 + 21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0x0), // name = AdapterAlreadyExists + 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists), @@ -1453,7 +1734,7 @@ void PortableServer::POA::AdapterInactive::_raise (void) PortableServer::POA::AdapterInactive_ptr PortableServer::POA::AdapterInactive::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc); else return 0; @@ -1474,7 +1755,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterInacti _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -1533,8 +1814,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada static const CORBA::Long _oc_PortableServer_POA_AdapterInactive[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x61637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/POA/AdapterInactive:1.0 + 51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x61637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/POA/AdapterInactive:1.0 16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500), // name = AdapterInactive + 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterInactive (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterInactive), (char *) @@ -1578,7 +1860,7 @@ void PortableServer::POA::AdapterNonExistent::_raise (void) PortableServer::POA::AdapterNonExistent_ptr PortableServer::POA::AdapterNonExistent::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc); else return 0; @@ -1599,7 +1881,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterNonExi _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -1658,8 +1940,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724e6f), ACE_NTOHL (0x6e457869), ACE_NTOHL (0x7374656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:PortableServer/POA/AdapterNonExistent:1.0 - 19, ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465724e), ACE_NTOHL (0x6f6e4578), ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e7400fd), // name = AdapterNonExistent + 54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724e6f), ACE_NTOHL (0x6e457869), ACE_NTOHL (0x7374656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0 + 19, ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465724e), ACE_NTOHL (0x6f6e4578), ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e740000), // name = AdapterNonExistent 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent @@ -1711,7 +1993,7 @@ void PortableServer::POA::InvalidPolicy::_raise (void) PortableServer::POA::InvalidPolicy_ptr PortableServer::POA::InvalidPolicy::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc); else return 0; @@ -1732,7 +2014,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::InvalidPolicy _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -1791,11 +2073,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Inv static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f49), ACE_NTOHL (0x6e76616c), ACE_NTOHL (0x6964506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:PortableServer/POA/InvalidPolicy:1.0 - 14, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7900fdfd), // name = InvalidPolicy + 49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f49), ACE_NTOHL (0x6e76616c), ACE_NTOHL (0x6964506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0 + 14, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000), // name = InvalidPolicy 1, // member count - 6, ACE_NTOHL (0x696e6465), ACE_NTOHL (0x7800fdfd), // name = index - CORBA::tk_ushort, + 6, ACE_NTOHL (0x696e6465), ACE_NTOHL (0x78000000), // name = index + CORBA::tk_ushort, + }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (CORBA::tk_except, sizeof (_oc_PortableServer_POA_InvalidPolicy), (char *) @@ -1839,7 +2122,7 @@ void PortableServer::POA::NoServant::_raise (void) PortableServer::POA::NoServant_ptr PortableServer::POA::NoServant::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/NoServant:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc); else return 0; @@ -1860,7 +2143,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::NoServant &_t _tao_any.replace (PortableServer::POA::_tc_NoServant, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -1919,8 +2202,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::NoS static const CORBA::Long _oc_PortableServer_POA_NoServant[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4e), ACE_NTOHL (0x6f536572), ACE_NTOHL (0x76616e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:PortableServer/POA/NoServant:1.0 - 10, ACE_NTOHL (0x4e6f5365), ACE_NTOHL (0x7276616e), ACE_NTOHL (0x7400fdfd), // name = NoServant + 45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4e), ACE_NTOHL (0x6f536572), ACE_NTOHL (0x76616e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/POA/NoServant:1.0 + 10, ACE_NTOHL (0x4e6f5365), ACE_NTOHL (0x7276616e), ACE_NTOHL (0x74000000), // name = NoServant 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (CORBA::tk_except, @@ -1967,7 +2250,7 @@ void PortableServer::POA::ObjectAlreadyActive::_raise (void) PortableServer::POA::ObjectAlreadyActive_ptr PortableServer::POA::ObjectAlreadyActive::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc); else return 0; @@ -1988,7 +2271,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlready _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2047,7 +2330,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x74416c72), ACE_NTOHL (0x65616479), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/POA/ObjectAlreadyActive:1.0 + 55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x74416c72), ACE_NTOHL (0x65616479), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0 20, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x6374416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x69766500), // name = ObjectAlreadyActive 0, // member count }; @@ -2091,7 +2374,7 @@ void PortableServer::POA::ObjectNotActive::_raise (void) PortableServer::POA::ObjectNotActive_ptr PortableServer::POA::ObjectNotActive::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc); else return 0; @@ -2112,7 +2395,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActi _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2171,7 +2454,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x744e6f74), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/POA/ObjectNotActive:1.0 + 51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x744e6f74), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0 16, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x69766500), // name = ObjectNotActive 0, // member count }; @@ -2215,7 +2498,7 @@ void PortableServer::POA::ServantAlreadyActive::_raise (void) PortableServer::POA::ServantAlreadyActive_ptr PortableServer::POA::ServantAlreadyActive::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc); else return 0; @@ -2236,7 +2519,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantAlread _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2295,8 +2578,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e74416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/POA/ServantAlreadyActive:1.0 - 21, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794163), ACE_NTOHL (0x74697665), ACE_NTOHL (0xfdfdfd), // name = ServantAlreadyActive + 56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e74416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0 + 21, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794163), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = ServantAlreadyActive 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive @@ -2339,7 +2622,7 @@ void PortableServer::POA::ServantNotActive::_raise (void) PortableServer::POA::ServantNotActive_ptr PortableServer::POA::ServantNotActive::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc); else return 0; @@ -2360,7 +2643,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantNotAct _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2419,8 +2702,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/POA/ServantNotActive:1.0 - 17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697665), ACE_NTOHL (0xfdfdfd), // name = ServantNotActive + 52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:1.0 + 17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = ServantNotActive 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive @@ -2463,7 +2746,7 @@ void PortableServer::POA::WrongAdapter::_raise (void) PortableServer::POA::WrongAdapter_ptr PortableServer::POA::WrongAdapter::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc); else return 0; @@ -2484,7 +2767,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2543,8 +2826,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/POA/WrongAdapter:1.0 - 13, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67416461), ACE_NTOHL (0x70746572), ACE_NTOHL (0xfdfdfd), // name = WrongAdapter + 48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:1.0 + 13, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67416461), ACE_NTOHL (0x70746572), ACE_NTOHL (0x0), // name = WrongAdapter 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter @@ -2587,7 +2870,7 @@ void PortableServer::POA::WrongPolicy::_raise (void) PortableServer::POA::WrongPolicy_ptr PortableServer::POA::WrongPolicy::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc); else return 0; @@ -2608,7 +2891,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy & _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2667,7 +2950,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/POA/WrongPolicy:1.0 + 47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:1.0 12, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900), // name = WrongPolicy 0, // member count }; @@ -2680,27 +2963,33 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc_TAO_tc_PortableS 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, "IDL:omg.org/PortableServer/POA:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::POA::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/POA:1.0"; +} + static const CORBA::Long _oc_PortableServer_POA[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f413a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:PortableServer/POA:1.0 + 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f413a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableServer/POA:1.0 4, ACE_NTOHL (0x504f4100), // name = POA, }; -static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (CORBA::tk_objref, sizeof - (_oc_PortableServer_POA), - (char *) - &_oc_PortableServer_POA, - 0, - sizeof - (PortableServer::POA)); -CORBA::TypeCode_ptr PortableServer::_tc_POA = &_tc_TAO_tc_PortableServer_POA; +static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (CORBA::tk_objref, + sizeof (_oc_PortableServer_POA), + (char *) &_oc_PortableServer_POA, + 0, + sizeof (PortableServer::POA)); +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableServer) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_POA, &_tc_TAO_tc_PortableServer_POA) +TAO_NAMESPACE_END PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer::Current_ptr obj) { @@ -2717,21 +3006,19 @@ PortableServer::Current_ptr PortableServer::Current::_narrow ( { if (CORBA::is_nil (obj)) return PortableServer::Current::_nil (); - if (!obj->_is_a ("IDL:PortableServer/Current:1.0", env)) + if (!obj->_is_a ("IDL:omg.org/PortableServer/Current:1.0", env)) return PortableServer::Current::_nil (); - TAO_Stub *stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); - if (!obj->_is_collocated () || !obj->_servant()) - { - PortableServer::Current_ptr new_obj = new PortableServer::Current(stub); - return new_obj; - } // end of if - - void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Current:1.0"); + void* servant = 0; + if (obj->_is_collocated () && obj->_servant() != 0) + servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/Current:1.0"); + if (servant == 0) + return new PortableServer::Current(stub); return new POA_PortableServer::_tao_collocated_Current( - ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant), - stub - ); + ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant), + stub + ); } // default constructor @@ -2768,7 +3055,7 @@ void PortableServer::Current::NoContext::_raise (void) PortableServer::Current::NoContext_ptr PortableServer::Current::NoContext::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableServer/Current/NoContext:1.0", exc->_id ())) // same type + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_id ())) // same type return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc); else return 0; @@ -2789,7 +3076,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::Current::NoContext _tao_any.replace (PortableServer::Current::_tc_NoContext, _tao_any_val, 1, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_CATCHANY + ACE_CATCHANY { delete _tao_any_val; } @@ -2848,8 +3135,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current: static const CORBA::Long _oc_PortableServer_Current_NoContext[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e742f4e), ACE_NTOHL (0x6f436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:PortableServer/Current/NoContext:1.0 - 10, ACE_NTOHL (0x4e6f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x7400fdfd), // name = NoContext + 49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e742f4e), ACE_NTOHL (0x6f436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableServer/Current/NoContext:1.0 + 10, ACE_NTOHL (0x4e6f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74000000), // name = NoContext 0, // member count }; static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext @@ -2858,43 +3145,79 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (PortableServer::Current::NoContext)); CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_PortableServer_Current_NoContext; -PortableServer::POA_ptr PortableServer::Current::get_POA (CORBA::Environment &env) +PortableServer::POA_ptr PortableServer::Current::get_POA (CORBA::Environment &ACE_TRY_ENV) { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return PortableServer::POA::_nil (); + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); } -PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &env) +PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &ACE_TRY_ENV) { - static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] = + static TAO_Exception_Data _tao_PortableServer_Current_get_object_id_exceptiondata [] = { - {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)} + {PortableServer::Current::_tc_NoContext, PortableServer::Current::NoContext::_alloc} }; - static const TAO_Call_Data PortableServer_Current_get_object_id_calldata = - {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0}; + PortableServer::ObjectId *_tao_retval = 0; + + TAO_Stub *istub = this->_stubobj (); + if (istub == 0) + ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + - PortableServer::ObjectId *retval = 0; + ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval); + TAO_GIOP_Twoway_Invocation _tao_call ( + istub, + "get_object_id", + TAO_ORB_Core_instance () + ); - void* _tao_arguments[1]; - void** _tao_current_arg = _tao_arguments; - *_tao_current_arg = &retval; _tao_current_arg++; - this->_stubobj ()->do_static_call (env, &PortableServer_Current_get_object_id_calldata, _tao_arguments); - return retval; + for (;;) + { + ACE_TRY_ENV.clear (); + _tao_call.start (ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); + + int _invoke_status = + _tao_call.invoke (_tao_PortableServer_Current_get_object_id_exceptiondata, 1, ACE_TRY_ENV); + ACE_CHECK_RETURN (_tao_retval); + + if (_invoke_status == TAO_INVOKE_RESTART) + continue; + // if (_invoke_status == TAO_INVOKE_EXCEPTION) + // cannot happen + if (_invoke_status != TAO_INVOKE_OK) + { + ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + + } + break; + + } + TAO_InputCDR &_tao_in = _tao_call.inp_stream (); + if (!( + (_tao_in >> *_tao_retval) + )) + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + return _tao_retval; } 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:CORBA/Current:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Current:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) || (!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, _tao_environment); // remote call } +const char* PortableServer::Current::_interface_repository_id (void) const +{ + return "IDL:omg.org/PortableServer/Current:1.0"; +} + static const CORBA::Long _oc_PortableServer_Current[] = { TAO_ENCAP_BYTE_ORDER, // byte order diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 2dbd4e9ea51..f2851425a6a 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -21,13 +21,22 @@ #include "tao/PolicyC.h" #include "tao/CurrentC.h" #include "tao/Exception.h" +#include "tao/Environment.h" +#include "tao/CDR.h" + +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export +#if defined(_MSC_VER) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ class TAO_ServantBase; class TAO_Local_ServantBase; class TAO_DynamicImplementation; -class TAO_Export PortableServer{ -public: +TAO_NAMESPACE PortableServer{ typedef TAO_ServantBase ServantBase; typedef ServantBase *Servant; @@ -108,7 +117,7 @@ public: typedef TAO_Unbounded_Sequence<CORBA::Octet > _tao_seq_Octet; typedef _tao_seq_Octet* _tao_seq_Octet_ptr; - static CORBA::TypeCode_ptr _tc__tao_seq_Octet; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc__tao_seq_Octet; #endif /* end #if !defined */ @@ -177,7 +186,7 @@ public: typedef _tao_seq_Octet_var ObjectId_var; typedef _tao_seq_Octet_out ObjectId_out; - static CORBA::TypeCode_ptr _tc_ObjectId; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ObjectId; #if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_) @@ -219,10 +228,7 @@ public: }; // exception PortableServer::ForwardRequest - friend void operator<<= (CORBA::Any &, const ForwardRequest &); // copying version - friend void operator<<= (CORBA::Any &, ForwardRequest*); // noncopying version - friend CORBA::Boolean operator>>= (const CORBA::Any &, ForwardRequest *&); - static CORBA::TypeCode_ptr _tc_ForwardRequest; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ForwardRequest; #endif /* end #if !defined */ @@ -236,7 +242,7 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) typedef ThreadPolicyValue &ThreadPolicyValue_out; - static CORBA::TypeCode_ptr _tc_ThreadPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue; #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_) @@ -302,7 +308,7 @@ public: #if !defined (_PORTABLESERVER_THREADPOLICY_CH_) #define _PORTABLESERVER_THREADPOLICY_CH_ - class TAO_Export ThreadPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export ThreadPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -312,11 +318,12 @@ public: // the static operations static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj); - static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ThreadPolicy_ptr _nil (void); - virtual ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: ThreadPolicy (TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, @@ -330,7 +337,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_ThreadPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicy; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -340,7 +347,7 @@ public: PERSISTENT }; typedef LifespanPolicyValue &LifespanPolicyValue_out; - static CORBA::TypeCode_ptr _tc_LifespanPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue; #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_) @@ -406,7 +413,7 @@ public: #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_) #define _PORTABLESERVER_LIFESPANPOLICY_CH_ - class TAO_Export LifespanPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export LifespanPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -416,11 +423,12 @@ public: // the static operations static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj); - static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static LifespanPolicy_ptr _nil (void); - virtual LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: LifespanPolicy ( TAO_Stub *objref = 0, @@ -436,7 +444,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_LifespanPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicy; enum IdUniquenessPolicyValue { @@ -444,7 +452,7 @@ public: MULTIPLE_ID }; typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out; - static CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue; #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_) @@ -510,7 +518,7 @@ public: #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_) #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_ - class TAO_Export IdUniquenessPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export IdUniquenessPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -520,11 +528,12 @@ public: // the static operations static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj); - static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static IdUniquenessPolicy_ptr _nil (void); - virtual IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: IdUniquenessPolicy ( TAO_Stub *objref = 0, @@ -540,7 +549,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_IdUniquenessPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicy; enum IdAssignmentPolicyValue { @@ -548,7 +557,7 @@ public: SYSTEM_ID }; typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out; - static CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue; #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_) @@ -614,7 +623,7 @@ public: #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_) #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_ - class TAO_Export IdAssignmentPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export IdAssignmentPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -624,11 +633,12 @@ public: // the static operations static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj); - static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static IdAssignmentPolicy_ptr _nil (void); - virtual IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: IdAssignmentPolicy ( TAO_Stub *objref = 0, @@ -644,7 +654,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_IdAssignmentPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicy; enum ImplicitActivationPolicyValue { @@ -655,7 +665,7 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; - static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_) @@ -721,7 +731,7 @@ public: #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_ - class TAO_Export ImplicitActivationPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export ImplicitActivationPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -731,11 +741,12 @@ public: // the static operations static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj); - static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ImplicitActivationPolicy_ptr _nil (void); - virtual ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: ImplicitActivationPolicy ( TAO_Stub *objref = 0, @@ -751,7 +762,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -764,7 +775,7 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; - static CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_) @@ -830,7 +841,7 @@ public: #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_) #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_ - class TAO_Export ServantRetentionPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export ServantRetentionPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -840,11 +851,12 @@ public: // the static operations static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj); - static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ServantRetentionPolicy_ptr _nil (void); - virtual ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: ServantRetentionPolicy ( TAO_Stub *objref = 0, @@ -860,7 +872,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_ServantRetentionPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicy; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -874,7 +886,7 @@ public: #if !defined (TAO_HAS_MINIMUM_CORBA) typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; - static CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_) @@ -940,7 +952,7 @@ public: #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_) #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_ - class TAO_Export RequestProcessingPolicy: public virtual ACE_CORBA_1(Policy) + class TAO_Export RequestProcessingPolicy: public virtual CORBA::Policy { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -950,11 +962,12 @@ public: // the static operations static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj); - static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static RequestProcessingPolicy_ptr _nil (void); - virtual RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: RequestProcessingPolicy ( TAO_Stub *objref = 0, @@ -970,7 +983,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicy; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -1054,7 +1067,7 @@ public: // the static operations static POAManager_ptr _duplicate (POAManager_ptr obj); - static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static POAManager_ptr _nil (void); @@ -1090,18 +1103,19 @@ public: #endif /* end #if !defined */ - virtual void activate (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual void activate (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual void hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual State get_state (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual State get_state (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: POAManager ( TAO_Stub *objref = 0, @@ -1117,7 +1131,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_POAManager; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POAManager; #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -1194,11 +1208,12 @@ public: // the static operations static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj); - static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static AdapterActivator_ptr _nil (void); - virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: AdapterActivator ( TAO_Stub *objref = 0, @@ -1214,7 +1229,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_AdapterActivator; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AdapterActivator; #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_) @@ -1291,10 +1306,11 @@ public: // the static operations static ServantManager_ptr _duplicate (ServantManager_ptr obj); - static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ServantManager_ptr _nil (void); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: ServantManager ( TAO_Stub *objref = 0, @@ -1310,7 +1326,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_ServantManager; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantManager; #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_) @@ -1386,12 +1402,13 @@ public: // the static operations static ServantActivator_ptr _duplicate (ServantActivator_ptr obj); - static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ServantActivator_ptr _nil (void); - virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual Servant incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: ServantActivator ( TAO_Stub *objref = 0, @@ -1407,7 +1424,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_ServantActivator; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantActivator; #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_) @@ -1486,12 +1503,13 @@ public: // the static operations static ServantLocator_ptr _duplicate (ServantLocator_ptr obj); - static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static ServantLocator_ptr _nil (void); - virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual Servant preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: ServantLocator ( TAO_Stub *objref = 0, @@ -1507,7 +1525,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_ServantLocator; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantLocator; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -1584,7 +1602,7 @@ public: // the static operations static POA_ptr _duplicate (POA_ptr obj); - static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static POA_ptr _nil (void); @@ -2004,55 +2022,56 @@ public: #endif /* end #if !defined */ - virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual POA_ptr create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual ThreadPolicy_ptr create_thread_policy (ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual LifespanPolicy_ptr create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual IdUniquenessPolicy_ptr create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual IdAssignmentPolicy_ptr create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual ImplicitActivationPolicy_ptr create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ServantRetentionPolicy_ptr create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual RequestProcessingPolicy_ptr create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual char * the_name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual POA_ptr the_parent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual POAManager_ptr the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #if !defined (TAO_HAS_MINIMUM_CORBA) - virtual AdapterActivator_ptr the_activator (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual ServantManager_ptr get_servant_manager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual Servant get_servant (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void set_servant (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; + virtual AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual Servant get_servant (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void set_servant (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual void deactivate_object (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual Servant id_to_servant (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual void deactivate_object (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Object_ptr create_reference (const char *intf, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Object_ptr create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Object_ptr servant_to_reference (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual Servant reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual Servant id_to_servant (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Object_ptr id_to_reference (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: POA ( TAO_Stub *objref = 0, @@ -2068,7 +2087,7 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_POA; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POA; #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_) @@ -2134,7 +2153,7 @@ public: #if !defined (_PORTABLESERVER_CURRENT_CH_) #define _PORTABLESERVER_CURRENT_CH_ - class TAO_Export Current: public virtual ACE_CORBA_1(Current) + class TAO_Export Current: public virtual CORBA::Current { public: #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 @@ -2144,7 +2163,7 @@ public: // the static operations static Current_ptr _duplicate (Current_ptr obj); - static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); static Current_ptr _nil (void); @@ -2185,9 +2204,10 @@ public: #endif /* end #if !defined */ - virtual POA_ptr get_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual ObjectId * get_object_id (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); - virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual ObjectId * get_object_id (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()); + virtual const char* _interface_repository_id (void) const; protected: Current ( TAO_Stub *objref = 0, @@ -2203,17 +2223,104 @@ public: #endif /* end #if !defined */ - static CORBA::TypeCode_ptr _tc_Current; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Current; - static char *ObjectId_to_string (const PortableServer::ObjectId &id); - static CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id); - static PortableServer::ObjectId *string_to_ObjectId (const char *id); - static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); + TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id); + TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id); + TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id); + TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id); }; #if defined (__ACE_INLINE__) #include "POAC.i" +#else +// POA's policies. +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::ThreadPolicy_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::LifespanPolicy_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicy_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicy_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicy_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicy_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &); +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicy_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicy_ptr &); + +// POA's exceptions. +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterInactive &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterInactive*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterInactive *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&); +void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version +void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version +CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&); + +// POA::Current && its exception. +CORBA::Boolean TAO_Export +operator<< (TAO_OutputCDR &, const PortableServer::Current_ptr ); +CORBA::Boolean TAO_Export +operator>> (TAO_InputCDR &, PortableServer::Current_ptr &); +CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::Current::NoContext &); // +CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::Current::NoContext &); #endif /* defined INLINE */ #endif /* TAO_IDL_POAC_H */ diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i index f6229c75d59..5b6a45ee813 100644 --- a/TAO/tao/POAC.i +++ b/TAO/tao/POAC.i @@ -3086,5 +3086,794 @@ PortableServer::Current_out::operator-> (void) return this->ptr_; } +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::ThreadPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::ThreadPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::ThreadPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::ThreadPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::ThreadPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::LifespanPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::LifespanPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::LifespanPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::LifespanPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::LifespanPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::IdUniquenessPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::IdUniquenessPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::IdUniquenessPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::IdUniquenessPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::IdUniquenessPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::IdAssignmentPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::IdAssignmentPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::IdAssignmentPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::IdAssignmentPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::IdAssignmentPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::ImplicitActivationPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::ImplicitActivationPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::ImplicitActivationPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::ImplicitActivationPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::ImplicitActivationPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::ServantRetentionPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::ServantRetentionPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::ServantRetentionPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::ServantRetentionPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::ServantRetentionPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval) +{ + return strm.write_ulong ((CORBA::ULong) _tao_enumval); +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval) +{ + CORBA::ULong _tao_temp; + if (strm.read_ulong (_tao_temp)) + { + ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong)); + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::RequestProcessingPolicy_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::RequestProcessingPolicy_ptr & + ); + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::RequestProcessingPolicy_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::RequestProcessingPolicy_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::RequestProcessingPolicy::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} + + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterAlreadyExists &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterAlreadyExists &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterInactive &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterInactive &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterNonExistent &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterNonExistent &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::InvalidPolicy &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + { + // now marshal the members (if any) + if ( + (strm << _tao_aggregate.index) + ) + return 1; + else + return 0; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::InvalidPolicy &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + // now marshal the members + if ( + (strm >> _tao_aggregate.index) + ) + return 1; + else + return 0; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::NoServant &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::NoServant &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectAlreadyActive &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ObjectAlreadyActive &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectNotActive &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ObjectNotActive &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ServantAlreadyActive &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ServantAlreadyActive &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ServantNotActive &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ServantNotActive &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::WrongAdapter &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::WrongAdapter &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::WrongPolicy &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::WrongPolicy &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &, + const PortableServer::Current_ptr + ); +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &, + PortableServer::Current_ptr & + ); + +ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::Current::NoContext &_tao_aggregate) +{ + // first marshal the repository ID + if (strm << _tao_aggregate._id ()) + return 1; + else + return 0; +} + +ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Current::NoContext &_tao_aggregate) +{ + // retrieve RepoID and verify if we are of that type + char *_tao_repoID; + if ((strm >> _tao_repoID) && + (_tao_aggregate._is_a (_tao_repoID))) + { + return 1; + } + else + return 0; +} + +ACE_INLINE CORBA::Boolean +operator<< ( + TAO_OutputCDR &strm, + const PortableServer::Current_ptr _tao_objref + ) +{ + CORBA::Object_ptr _tao_corba_obj = _tao_objref; + return (strm << _tao_corba_obj); +} + +ACE_INLINE CORBA::Boolean +operator>> ( + TAO_InputCDR &strm, + PortableServer::Current_ptr &_tao_objref + ) +{ + ACE_TRY_NEW_ENV + { + CORBA::Object_var obj; + if ((strm >> obj.inout ()) == 0) + return 0; + // narrow to the right type + _tao_objref = + PortableServer::Current::_narrow ( + obj.in (), + ACE_TRY_ENV + ); + ACE_TRY_CHECK; + return 1; + } + ACE_CATCHANY + { + // do nothing + } + ACE_ENDTRY; + return 0; +} #endif // end #if !defined diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index dcbade145de..448f5629f12 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -20,18 +20,83 @@ ACE_RCSID(tao, POAS, "$Id$") #if !defined (TAO_HAS_MINIMUM_CORBA) -static const TAO_operation_db_entry PortableServer_ThreadPolicy_operations [] = { - {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::ThreadPolicy::copy_skel}, - {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::ThreadPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel} +class TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::ThreadPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::ThreadPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::ThreadPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); -static const CORBA::Long _tao_PortableServer_ThreadPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_ThreadPolicy_optable_pool [_tao_PortableServer_ThreadPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_ThreadPolicy_allocator (_tao_PortableServer_ThreadPolicy_optable_pool, _tao_PortableServer_ThreadPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_ThreadPolicy_optable (PortableServer_ThreadPolicy_operations, 5, 10, &_tao_PortableServer_ThreadPolicy_allocator); + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; + + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable tao_PortableServer_ThreadPolicy_optable; // skeleton constructor POA_PortableServer::ThreadPolicy::ThreadPolicy (void) @@ -43,45 +108,31 @@ void POA_PortableServer::ThreadPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_ThreadPolicy_value_paramdata [] = - { - {PortableServer::_tc_ThreadPolicyValue, 0, 0} - }; // PortableServer_ThreadPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_ThreadPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata}; - POA_PortableServer::ThreadPolicy *_tao_impl = (POA_PortableServer::ThreadPolicy *)_tao_object_reference; PortableServer::ThreadPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_ThreadPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_ThreadPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); } void POA_PortableServer::ThreadPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -91,69 +142,89 @@ void POA_PortableServer::ThreadPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_ThreadPolicy_is_a_paramdata}; POA_PortableServer::ThreadPolicy_ptr _tao_impl = (POA_PortableServer::ThreadPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_ThreadPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_ThreadPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_ThreadPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_ThreadPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ThreadPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::ThreadPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_ThreadPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_ThreadPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::ThreadPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ThreadPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/ThreadPolicy:1.0"; + return "IDL:omg.org/PortableServer/ThreadPolicy:1.0"; } POA_PortableServer::_tao_collocated_ThreadPolicy::_tao_collocated_ThreadPolicy ( @@ -174,47 +245,47 @@ POA_PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_ThreadP CORBA::Boolean POA_PortableServer::_tao_collocated_ThreadPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_ThreadPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_ThreadPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::ThreadPolicyValue POA_PortableServer::_tao_collocated_ThreadPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } PortableServer::ThreadPolicy* @@ -228,18 +299,83 @@ POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV) #endif /* TAO_HAS_MINIMUM_CORBA */ -static const TAO_operation_db_entry PortableServer_LifespanPolicy_operations [] = { - {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::LifespanPolicy::copy_skel}, - {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::LifespanPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel} +class TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::LifespanPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::LifespanPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::LifespanPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; -static const CORBA::Long _tao_PortableServer_LifespanPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_LifespanPolicy_optable_pool [_tao_PortableServer_LifespanPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_LifespanPolicy_allocator (_tao_PortableServer_LifespanPolicy_optable_pool, _tao_PortableServer_LifespanPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_LifespanPolicy_optable (PortableServer_LifespanPolicy_operations, 5, 10, &_tao_PortableServer_LifespanPolicy_allocator); + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable tao_PortableServer_LifespanPolicy_optable; // skeleton constructor POA_PortableServer::LifespanPolicy::LifespanPolicy (void) @@ -251,45 +387,32 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_LifespanPolicy_value_paramdata [] = - { - {PortableServer::_tc_LifespanPolicyValue, 0, 0} - }; // PortableServer_LifespanPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_LifespanPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata}; - POA_PortableServer::LifespanPolicy *_tao_impl = (POA_PortableServer::LifespanPolicy *)_tao_object_reference; PortableServer::LifespanPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_LifespanPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_LifespanPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::LifespanPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -299,69 +422,89 @@ void POA_PortableServer::LifespanPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_LifespanPolicy_is_a_paramdata}; POA_PortableServer::LifespanPolicy_ptr _tao_impl = (POA_PortableServer::LifespanPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_LifespanPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_LifespanPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_LifespanPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_LifespanPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/LifespanPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::LifespanPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_LifespanPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_LifespanPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::LifespanPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/LifespanPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/LifespanPolicy:1.0"; + return "IDL:omg.org/PortableServer/LifespanPolicy:1.0"; } POA_PortableServer::_tao_collocated_LifespanPolicy::_tao_collocated_LifespanPolicy ( @@ -382,46 +525,46 @@ POA_PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_Lifes CORBA::Boolean POA_PortableServer::_tao_collocated_LifespanPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_LifespanPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_LifespanPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::LifespanPolicyValue POA_PortableServer::_tao_collocated_LifespanPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } PortableServer::LifespanPolicy* @@ -433,18 +576,83 @@ POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV) return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub); } -static const TAO_operation_db_entry PortableServer_IdUniquenessPolicy_operations [] = { - {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel}, - {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel} +class TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::IdUniquenessPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; -static const CORBA::Long _tao_PortableServer_IdUniquenessPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_IdUniquenessPolicy_optable_pool [_tao_PortableServer_IdUniquenessPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_IdUniquenessPolicy_allocator (_tao_PortableServer_IdUniquenessPolicy_optable_pool, _tao_PortableServer_IdUniquenessPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable (PortableServer_IdUniquenessPolicy_operations, 5, 10, &_tao_PortableServer_IdUniquenessPolicy_allocator); + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable; // skeleton constructor POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void) @@ -456,45 +664,32 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_paramdata [] = - { - {PortableServer::_tc_IdUniquenessPolicyValue, 0, 0} - }; // PortableServer_IdUniquenessPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata}; - POA_PortableServer::IdUniquenessPolicy *_tao_impl = (POA_PortableServer::IdUniquenessPolicy *)_tao_object_reference; PortableServer::IdUniquenessPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_IdUniquenessPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_IdUniquenessPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::IdUniquenessPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -504,69 +699,89 @@ void POA_PortableServer::IdUniquenessPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_IdUniquenessPolicy_is_a_paramdata}; POA_PortableServer::IdUniquenessPolicy_ptr _tao_impl = (POA_PortableServer::IdUniquenessPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_IdUniquenessPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_IdUniquenessPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_IdUniquenessPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_IdUniquenessPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::IdUniquenessPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_IdUniquenessPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_IdUniquenessPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::IdUniquenessPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdUniquenessPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/IdUniquenessPolicy:1.0"; + return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0"; } POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_tao_collocated_IdUniquenessPolicy ( @@ -587,69 +802,134 @@ POA_PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_I CORBA::Boolean POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_IdUniquenessPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_IdUniquenessPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::IdUniquenessPolicyValue POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } + PortableServer::IdUniquenessPolicy* -POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &TAO_IN_ENV) +POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &ACE_TRY_ENV) { - TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); - if (TAO_IN_ENV.exception () != 0) - return 0; + TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); + ACE_CHECK_RETURN (0); return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub); } -static const TAO_operation_db_entry PortableServer_IdAssignmentPolicy_operations [] = { - {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel}, - {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel} +class TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::IdAssignmentPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; -static const CORBA::Long _tao_PortableServer_IdAssignmentPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_IdAssignmentPolicy_optable_pool [_tao_PortableServer_IdAssignmentPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_IdAssignmentPolicy_allocator (_tao_PortableServer_IdAssignmentPolicy_optable_pool, _tao_PortableServer_IdAssignmentPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable (PortableServer_IdAssignmentPolicy_operations, 5, 10, &_tao_PortableServer_IdAssignmentPolicy_allocator); + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable; // skeleton constructor POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void) @@ -661,45 +941,32 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_paramdata [] = - { - {PortableServer::_tc_IdAssignmentPolicyValue, 0, 0} - }; // PortableServer_IdAssignmentPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata}; - POA_PortableServer::IdAssignmentPolicy *_tao_impl = (POA_PortableServer::IdAssignmentPolicy *)_tao_object_reference; PortableServer::IdAssignmentPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_IdAssignmentPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_IdAssignmentPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::IdAssignmentPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -709,69 +976,89 @@ void POA_PortableServer::IdAssignmentPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_IdAssignmentPolicy_is_a_paramdata}; POA_PortableServer::IdAssignmentPolicy_ptr _tao_impl = (POA_PortableServer::IdAssignmentPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_IdAssignmentPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_IdAssignmentPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_IdAssignmentPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_IdAssignmentPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::IdAssignmentPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_IdAssignmentPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_IdAssignmentPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::IdAssignmentPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdAssignmentPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/IdAssignmentPolicy:1.0"; + return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0"; } POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_tao_collocated_IdAssignmentPolicy ( @@ -792,46 +1079,46 @@ POA_PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_I CORBA::Boolean POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_IdAssignmentPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_IdAssignmentPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::IdAssignmentPolicyValue POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } PortableServer::IdAssignmentPolicy* @@ -845,18 +1132,83 @@ POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV) #if !defined (TAO_HAS_MINIMUM_CORBA) -static const TAO_operation_db_entry PortableServer_ImplicitActivationPolicy_operations [] = { - {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel}, - {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel} +class TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); -static const CORBA::Long _tao_PortableServer_ImplicitActivationPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_ImplicitActivationPolicy_optable_pool [_tao_PortableServer_ImplicitActivationPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_ImplicitActivationPolicy_allocator (_tao_PortableServer_ImplicitActivationPolicy_optable_pool, _tao_PortableServer_ImplicitActivationPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable (PortableServer_ImplicitActivationPolicy_operations, 5, 10, &_tao_PortableServer_ImplicitActivationPolicy_allocator); + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; + + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable; // skeleton constructor POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void) @@ -868,45 +1220,32 @@ void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] = - { - {PortableServer::_tc_ImplicitActivationPolicyValue, 0, 0} - }; // PortableServer_ImplicitActivationPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata}; - POA_PortableServer::ImplicitActivationPolicy *_tao_impl = (POA_PortableServer::ImplicitActivationPolicy *)_tao_object_reference; PortableServer::ImplicitActivationPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_ImplicitActivationPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_ImplicitActivationPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -916,69 +1255,89 @@ void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_ImplicitActivationPolicy_is_a_paramdata}; POA_PortableServer::ImplicitActivationPolicy_ptr _tao_impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_ImplicitActivationPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_ImplicitActivationPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_ImplicitActivationPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_ImplicitActivationPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_ImplicitActivationPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_ImplicitActivationPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::ImplicitActivationPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ImplicitActivationPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/ImplicitActivationPolicy:1.0"; + return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0"; } POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_tao_collocated_ImplicitActivationPolicy ( @@ -999,46 +1358,46 @@ POA_PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_colloc CORBA::Boolean POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::ImplicitActivationPolicyValue POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } PortableServer::ImplicitActivationPolicy* @@ -1050,18 +1409,83 @@ POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_E return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub); } -static const TAO_operation_db_entry PortableServer_ServantRetentionPolicy_operations [] = { - {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel}, - {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel} +class TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::ServantRetentionPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); + + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; -static const CORBA::Long _tao_PortableServer_ServantRetentionPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_ServantRetentionPolicy_optable_pool [_tao_PortableServer_ServantRetentionPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_ServantRetentionPolicy_allocator (_tao_PortableServer_ServantRetentionPolicy_optable_pool, _tao_PortableServer_ServantRetentionPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable (PortableServer_ServantRetentionPolicy_operations, 5, 10, &_tao_PortableServer_ServantRetentionPolicy_allocator); + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable; // skeleton constructor POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void) @@ -1073,45 +1497,32 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_paramdata [] = - { - {PortableServer::_tc_ServantRetentionPolicyValue, 0, 0} - }; // PortableServer_ServantRetentionPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata}; - POA_PortableServer::ServantRetentionPolicy *_tao_impl = (POA_PortableServer::ServantRetentionPolicy *)_tao_object_reference; PortableServer::ServantRetentionPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_ServantRetentionPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_ServantRetentionPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::ServantRetentionPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -1121,69 +1532,89 @@ void POA_PortableServer::ServantRetentionPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_ServantRetentionPolicy_is_a_paramdata}; POA_PortableServer::ServantRetentionPolicy_ptr _tao_impl = (POA_PortableServer::ServantRetentionPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_ServantRetentionPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_ServantRetentionPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_ServantRetentionPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_ServantRetentionPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::ServantRetentionPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_ServantRetentionPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_ServantRetentionPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::ServantRetentionPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantRetentionPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/ServantRetentionPolicy:1.0"; + return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0"; } POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_tao_collocated_ServantRetentionPolicy ( @@ -1204,46 +1635,46 @@ POA_PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocat CORBA::Boolean POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_ServantRetentionPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_ServantRetentionPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::ServantRetentionPolicyValue POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } PortableServer::ServantRetentionPolicy* @@ -1255,18 +1686,83 @@ POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub); } -static const TAO_operation_db_entry PortableServer_RequestProcessingPolicy_operations [] = { - {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel}, - {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel}, - {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel}, - {"_get_policy_type", &POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel}, - {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel} +class TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 0, 17, 0, 17, 0, + 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17, 17, 17, 17, 0, 17, 17, 17, + 17, 0, 17, 17, 17, 17, 17, 17, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 6, + MIN_WORD_LENGTH = 4, + MAX_WORD_LENGTH = 16, + MIN_HASH_VALUE = 4, + MAX_HASH_VALUE = 16, + HASH_VALUE_RANGE = 13, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, + {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel}, + {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel}, + {"",}, + {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel}, + {"",}, {"",}, + {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel}, + {"",}, {"",}, + {"_non_existent", &POA_PortableServer::RequestProcessingPolicy::_non_existent_skel}, + {"",}, {"",}, + {"_get_policy_type", &POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); -static const CORBA::Long _tao_PortableServer_RequestProcessingPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15); -static char _tao_PortableServer_RequestProcessingPolicy_optable_pool [_tao_PortableServer_RequestProcessingPolicy_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_RequestProcessingPolicy_allocator (_tao_PortableServer_RequestProcessingPolicy_optable_pool, _tao_PortableServer_RequestProcessingPolicy_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable (PortableServer_RequestProcessingPolicy_operations, 5, 10, &_tao_PortableServer_RequestProcessingPolicy_allocator); + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; + + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable; // skeleton constructor POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void) @@ -1278,45 +1774,32 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_paramdata [] = - { - {PortableServer::_tc_RequestProcessingPolicyValue, 0, 0} - }; // PortableServer_RequestProcessingPolicy_value_paramdata - - static const TAO_Call_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_calldata = - {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata}; - POA_PortableServer::RequestProcessingPolicy *_tao_impl = (POA_PortableServer::RequestProcessingPolicy *)_tao_object_reference; PortableServer::RequestProcessingPolicyValue _tao_retval; - _tao_server_request.demarshal ( - _tao_orb_environment, - &_get_PortableServer_RequestProcessingPolicy_value_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; _tao_retval = _tao_impl->value ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &_get_PortableServer_RequestProcessingPolicy_value_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::RequestProcessingPolicy::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -1326,69 +1809,89 @@ void POA_PortableServer::RequestProcessingPolicy::_is_a_skel ( {"_is_a", 1, 2, PortableServer_RequestProcessingPolicy_is_a_paramdata}; POA_PortableServer::RequestProcessingPolicy_ptr _tao_impl = (POA_PortableServer::RequestProcessingPolicy_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_RequestProcessingPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_RequestProcessingPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_RequestProcessingPolicy_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_RequestProcessingPolicy_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::RequestProcessingPolicy::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_RequestProcessingPolicy_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_RequestProcessingPolicy_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::RequestProcessingPolicy::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/RequestProcessingPolicy:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0) return ACE_static_cast (POA_CORBA::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) +void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const { - return "IDL:PortableServer/RequestProcessingPolicy:1.0"; + return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0"; } POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_tao_collocated_RequestProcessingPolicy ( @@ -1409,46 +1912,46 @@ POA_PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_colloca CORBA::Boolean POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Policy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::copy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->copy ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_RequestProcessingPolicy::destroy ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::PolicyType POA_PortableServer::_tao_collocated_RequestProcessingPolicy::policy_type ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->policy_type (_tao_orb_environment); + return this->servant_->policy_type (ACE_TRY_ENV); } PortableServer::RequestProcessingPolicyValue POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->value(_tao_orb_environment); + return this->servant_->value(ACE_TRY_ENV); } PortableServer::RequestProcessingPolicy* @@ -1481,7 +1984,7 @@ void POA_PortableServer::POAManager::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { // CORBA::Environment _tao_skel_environment; @@ -1496,15 +1999,15 @@ void POA_PortableServer::POAManager::_is_a_skel ( CORBA::Boolean _tao_retval; char *_tao_value = 0; _tao_server_request.demarshal ( - _tao_orb_environment, + ACE_TRY_ENV, &PortableServer_POAManager_is_a_calldata, &_tao_retval, &_tao_value ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + if (ACE_TRY_ENV.exception () != 0) return; + _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV); _tao_server_request.marshal ( - _tao_orb_environment, + ACE_TRY_ENV, // _tao_skel_environment, &PortableServer_POAManager_is_a_calldata, &_tao_retval, @@ -1515,12 +2018,12 @@ void POA_PortableServer::POAManager::_is_a_skel ( CORBA::Boolean POA_PortableServer::POAManager::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POAManager:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; @@ -1530,30 +2033,30 @@ void* POA_PortableServer::POAManager::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POAManager:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) +void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::POAManager::_interface_repository_id (void) const { - return "IDL:PortableServer/POAManager:1.0"; + return "IDL:omg.org/PortableServer/POAManager:1.0"; } POA_PortableServer::_tao_collocated_POAManager::_tao_collocated_POAManager ( @@ -1573,21 +2076,21 @@ POA_PortableServer::POAManager_ptr POA_PortableServer::_tao_collocated_POAManage CORBA::Boolean POA_PortableServer::_tao_collocated_POAManager::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POAManager::activate ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->activate ( - _tao_orb_environment + ACE_TRY_ENV ); } @@ -1595,45 +2098,45 @@ void POA_PortableServer::_tao_collocated_POAManager::activate ( void POA_PortableServer::_tao_collocated_POAManager::hold_requests ( CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->hold_requests ( wait_for_completion, - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POAManager::discard_requests ( CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->discard_requests ( wait_for_completion, - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POAManager::deactivate ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->deactivate ( etherealize_objects, wait_for_completion, - _tao_orb_environment + ACE_TRY_ENV ); } #endif /* TAO_HAS_MINIMUM_CORBA */ PortableServer::POAManager::State -POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &_tao_orb_environment) +POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &ACE_TRY_ENV) { - return this->servant_->get_state (_tao_orb_environment); + return this->servant_->get_state (ACE_TRY_ENV); } PortableServer::POAManager* @@ -1666,7 +2169,7 @@ void POA_PortableServer::AdapterActivator::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { // CORBA::Environment _tao_skel_environment; @@ -1681,15 +2184,15 @@ void POA_PortableServer::AdapterActivator::_is_a_skel ( CORBA::Boolean _tao_retval; char *_tao_value = 0; _tao_server_request.demarshal ( - _tao_orb_environment, + ACE_TRY_ENV, &PortableServer_AdapterActivator_is_a_calldata, &_tao_retval, &_tao_value ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + if (ACE_TRY_ENV.exception () != 0) return; + _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV); _tao_server_request.marshal ( - _tao_orb_environment, + ACE_TRY_ENV, // _tao_skel_environment, &PortableServer_AdapterActivator_is_a_calldata, &_tao_retval, @@ -1700,12 +2203,12 @@ void POA_PortableServer::AdapterActivator::_is_a_skel ( CORBA::Boolean POA_PortableServer::AdapterActivator::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/AdapterActivator:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; @@ -1715,30 +2218,30 @@ void* POA_PortableServer::AdapterActivator::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/AdapterActivator:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) +void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::AdapterActivator::_interface_repository_id (void) const { - return "IDL:PortableServer/AdapterActivator:1.0"; + return "IDL:omg.org/PortableServer/AdapterActivator:1.0"; } POA_PortableServer::_tao_collocated_AdapterActivator::_tao_collocated_AdapterActivator ( @@ -1758,25 +2261,25 @@ POA_PortableServer::AdapterActivator_ptr POA_PortableServer::_tao_collocated_Ada CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_adapter ( PortableServer::POA_ptr parent, const char* name, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->unknown_adapter ( parent, name, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -1809,7 +2312,7 @@ void POA_PortableServer::ServantManager::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { // CORBA::Environment _tao_skel_environment; @@ -1824,15 +2327,15 @@ void POA_PortableServer::ServantManager::_is_a_skel ( CORBA::Boolean _tao_retval; char *_tao_value = 0; _tao_server_request.demarshal ( - _tao_orb_environment, + ACE_TRY_ENV, &PortableServer_ServantManager_is_a_calldata, &_tao_retval, &_tao_value ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + if (ACE_TRY_ENV.exception () != 0) return; + _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV); _tao_server_request.marshal ( - _tao_orb_environment, + ACE_TRY_ENV, // _tao_skel_environment, &PortableServer_ServantManager_is_a_calldata, &_tao_retval, @@ -1843,12 +2346,12 @@ void POA_PortableServer::ServantManager::_is_a_skel ( CORBA::Boolean POA_PortableServer::ServantManager::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; @@ -1858,30 +2361,30 @@ void* POA_PortableServer::ServantManager::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) +void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::ServantManager::_interface_repository_id (void) const { - return "IDL:PortableServer/ServantManager:1.0"; + return "IDL:omg.org/PortableServer/ServantManager:1.0"; } POA_PortableServer::_tao_collocated_ServantManager::_tao_collocated_ServantManager ( @@ -1901,12 +2404,12 @@ POA_PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_Serva CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -1939,7 +2442,7 @@ void POA_PortableServer::ServantActivator::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { // CORBA::Environment _tao_skel_environment; @@ -1954,15 +2457,15 @@ void POA_PortableServer::ServantActivator::_is_a_skel ( CORBA::Boolean _tao_retval; char *_tao_value = 0; _tao_server_request.demarshal ( - _tao_orb_environment, + ACE_TRY_ENV, &PortableServer_ServantActivator_is_a_calldata, &_tao_retval, &_tao_value ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + if (ACE_TRY_ENV.exception () != 0) return; + _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV); _tao_server_request.marshal ( - _tao_orb_environment, + ACE_TRY_ENV, // _tao_skel_environment, &PortableServer_ServantActivator_is_a_calldata, &_tao_retval, @@ -1973,13 +2476,13 @@ void POA_PortableServer::ServantActivator::_is_a_skel ( CORBA::Boolean POA_PortableServer::ServantActivator::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantActivator:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; @@ -1989,32 +2492,32 @@ void* POA_PortableServer::ServantActivator::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantActivator:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) +void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::ServantActivator::_interface_repository_id (void) const { - return "IDL:PortableServer/ServantActivator:1.0"; + return "IDL:omg.org/PortableServer/ServantActivator:1.0"; } POA_PortableServer::_tao_collocated_ServantActivator::_tao_collocated_ServantActivator ( @@ -2035,25 +2538,25 @@ POA_PortableServer::ServantActivator_ptr POA_PortableServer::_tao_collocated_Ser CORBA::Boolean POA_PortableServer::_tao_collocated_ServantActivator::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::Servant POA_PortableServer::_tao_collocated_ServantActivator::incarnate ( const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->incarnate ( oid, adapter, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2063,7 +2566,7 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize ( PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->etherealize ( @@ -2072,7 +2575,7 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize ( serv, cleanup_in_progress, remaining_activations, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2105,7 +2608,7 @@ void POA_PortableServer::ServantLocator::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { // CORBA::Environment _tao_skel_environment; @@ -2120,15 +2623,15 @@ void POA_PortableServer::ServantLocator::_is_a_skel ( CORBA::Boolean _tao_retval; char *_tao_value = 0; _tao_server_request.demarshal ( - _tao_orb_environment, + ACE_TRY_ENV, &PortableServer_ServantLocator_is_a_calldata, &_tao_retval, &_tao_value ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + if (ACE_TRY_ENV.exception () != 0) return; + _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV); _tao_server_request.marshal ( - _tao_orb_environment, + ACE_TRY_ENV, // _tao_skel_environment, &PortableServer_ServantLocator_is_a_calldata, &_tao_retval, @@ -2139,13 +2642,13 @@ void POA_PortableServer::ServantLocator::_is_a_skel ( CORBA::Boolean POA_PortableServer::ServantLocator::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { 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 (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantLocator:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; @@ -2155,32 +2658,32 @@ void* POA_PortableServer::ServantLocator::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantLocator:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) +void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::ServantLocator::_interface_repository_id (void) const { - return "IDL:PortableServer/ServantLocator:1.0"; + return "IDL:omg.org/PortableServer/ServantLocator:1.0"; } POA_PortableServer::_tao_collocated_ServantLocator::_tao_collocated_ServantLocator ( @@ -2201,12 +2704,12 @@ POA_PortableServer::ServantLocator_ptr POA_PortableServer::_tao_collocated_Serva CORBA::Boolean POA_PortableServer::_tao_collocated_ServantLocator::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2215,7 +2718,7 @@ PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::prei PortableServer::POA_ptr adapter, const char * operation, PortableServer::ServantLocator::Cookie & the_cookie, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->preinvoke ( @@ -2223,7 +2726,7 @@ PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::prei adapter, operation, the_cookie, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2233,7 +2736,7 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke ( const char * operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->postinvoke ( @@ -2242,7 +2745,7 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke ( operation, the_cookie, the_servant, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2277,7 +2780,7 @@ void POA_PortableServer::POA::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { // CORBA::Environment _tao_skel_environment; @@ -2292,15 +2795,15 @@ void POA_PortableServer::POA::_is_a_skel ( CORBA::Boolean _tao_retval; char *_tao_value = 0; _tao_server_request.demarshal ( - _tao_orb_environment, + ACE_TRY_ENV, &PortableServer_POA_is_a_calldata, &_tao_retval, &_tao_value ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + if (ACE_TRY_ENV.exception () != 0) return; + _tao_retval = _tao_impl->_is_a (_tao_value, ACE_TRY_ENV); _tao_server_request.marshal ( - _tao_orb_environment, + ACE_TRY_ENV, // _tao_skel_environment, &PortableServer_POA_is_a_calldata, &_tao_retval, @@ -2311,12 +2814,12 @@ void POA_PortableServer::POA::_is_a_skel ( CORBA::Boolean POA_PortableServer::POA::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POA:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; @@ -2326,30 +2829,30 @@ void* POA_PortableServer::POA::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POA:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/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) +void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::POA::_interface_repository_id (void) const { - return "IDL:PortableServer/POA:1.0"; + return "IDL:omg.org/PortableServer/POA:1.0"; } POA_PortableServer::_tao_collocated_POA::_tao_collocated_POA ( @@ -2369,12 +2872,12 @@ POA_PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::_get_servan CORBA::Boolean POA_PortableServer::_tao_collocated_POA::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2382,40 +2885,40 @@ PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::create_POA ( const char* adapter_name, PortableServer::POAManager_ptr a_POAManager, const CORBA::PolicyList & policies, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_POA ( adapter_name, a_POAManager, policies, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::find_POA ( const char* adapter_name, CORBA::Boolean activate_it, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->find_POA ( adapter_name, activate_it, - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POA::destroy ( CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->destroy ( etherealize_objects, wait_for_completion, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2423,12 +2926,12 @@ void POA_PortableServer::_tao_collocated_POA::destroy ( PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_thread_policy ( PortableServer::ThreadPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_thread_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2436,34 +2939,34 @@ PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_POA::create PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_lifespan_policy ( PortableServer::LifespanPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_lifespan_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_uniqueness_policy ( PortableServer::IdUniquenessPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_id_uniqueness_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_assignment_policy ( PortableServer::IdAssignmentPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_id_assignment_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2471,34 +2974,34 @@ PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_POA:: PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_implicit_activation_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_servant_retention_policy ( PortableServer::ServantRetentionPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_servant_retention_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_request_processing_policy ( PortableServer::RequestProcessingPolicyValue value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_request_processing_policy ( value, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2506,84 +3009,84 @@ PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_ char* POA_PortableServer::_tao_collocated_POA::the_name ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->the_name(_tao_orb_environment); + return this->servant_->the_name(ACE_TRY_ENV); } PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::the_parent ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->the_parent(_tao_orb_environment); + return this->servant_->the_parent(ACE_TRY_ENV); } PortableServer::POAManager_ptr POA_PortableServer::_tao_collocated_POA::the_POAManager ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->the_POAManager(_tao_orb_environment); + return this->servant_->the_POAManager(ACE_TRY_ENV); } #if !defined (TAO_HAS_MINIMUM_CORBA) PortableServer::AdapterActivator_ptr POA_PortableServer::_tao_collocated_POA::the_activator ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - return this->servant_->the_activator(_tao_orb_environment); + return this->servant_->the_activator(ACE_TRY_ENV); } void POA_PortableServer::_tao_collocated_POA::the_activator ( PortableServer::AdapterActivator_ptr _tao_value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->the_activator ( _tao_value, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_POA::get_servant_manager ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->get_servant_manager ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POA::set_servant_manager ( PortableServer::ServantManager_ptr imgr, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->set_servant_manager ( imgr, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::Servant POA_PortableServer::_tao_collocated_POA::get_servant ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->get_servant ( - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POA::set_servant ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->set_servant ( p_servant, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2591,126 +3094,126 @@ void POA_PortableServer::_tao_collocated_POA::set_servant ( PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::activate_object ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->activate_object ( p_servant, - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POA::activate_object_with_id ( const PortableServer::ObjectId & id, PortableServer::Servant p_servant, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->activate_object_with_id ( id, p_servant, - _tao_orb_environment + ACE_TRY_ENV ); } void POA_PortableServer::_tao_collocated_POA::deactivate_object ( const PortableServer::ObjectId & oid, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { this->servant_->deactivate_object ( oid, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference ( const char *intf, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_reference ( intf, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference_with_id ( const PortableServer::ObjectId & oid, const char *intf, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->create_reference_with_id ( oid, intf, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::servant_to_id ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->servant_to_id ( p_servant, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::servant_to_reference ( PortableServer::Servant p_servant, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->servant_to_reference ( p_servant, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::Servant POA_PortableServer::_tao_collocated_POA::reference_to_servant ( CORBA::Object_ptr reference, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->reference_to_servant ( reference, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::reference_to_id ( CORBA::Object_ptr reference, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->reference_to_id ( reference, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::Servant POA_PortableServer::_tao_collocated_POA::id_to_servant ( const PortableServer::ObjectId & oid, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->id_to_servant ( oid, - _tao_orb_environment + ACE_TRY_ENV ); } CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference ( const PortableServer::ObjectId & oid, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->id_to_reference ( oid, - _tao_orb_environment + ACE_TRY_ENV ); } @@ -2724,16 +3227,79 @@ POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV) return new POA_PortableServer::_tao_collocated_POA (this, stub); } -static const TAO_operation_db_entry PortableServer_Current_operations [] = { - {"get_POA", &POA_PortableServer::Current::get_POA_skel}, - {"get_object_id", &POA_PortableServer::Current::get_object_id_skel}, - {"_is_a", &POA_PortableServer::Current::_is_a_skel} +class TAO_PortableServer_Current_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable +{ +private: + unsigned int hash (const char *str, unsigned int len); +public: + const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; +/* starting time is 0:12:47 */ +/* C++ code produced by gperf version 2.7 (GNU C++ version) */ +/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_Current_Perfect_Hash_OpTable -N lookup */ +unsigned int +TAO_PortableServer_Current_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) +{ + static const unsigned char asso_values[] = + { + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 0, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 0, 15, 0, 15, 15, + 1, 15, 15, 0, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 0, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, + }; + return len + asso_values[str[len - 1]] + asso_values[str[0]]; +} + +const class TAO_operation_db_entry * +TAO_PortableServer_Current_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) +{ + enum + { + TOTAL_KEYWORDS = 4, + MIN_WORD_LENGTH = 5, + MAX_WORD_LENGTH = 13, + MIN_HASH_VALUE = 5, + MAX_HASH_VALUE = 14, + HASH_VALUE_RANGE = 10, + DUPLICATES = 0 + }; + + static const class TAO_operation_db_entry wordlist[] = + { + {"",}, {"",}, {"",}, {"",}, {"",}, + {"_is_a", &POA_PortableServer::Current::_is_a_skel}, + {"",}, + {"get_POA", &POA_PortableServer::Current::get_POA_skel}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"_non_existent", &POA_PortableServer::Current::_non_existent_skel}, + {"get_object_id", &POA_PortableServer::Current::get_object_id_skel}, + }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) + { + unsigned int key = hash (str, len); -static const CORBA::Long _tao_PortableServer_Current_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9); -static char _tao_PortableServer_Current_optable_pool [_tao_PortableServer_Current_optable_size]; -static ACE_Static_Allocator_Base _tao_PortableServer_Current_allocator (_tao_PortableServer_Current_optable_pool, _tao_PortableServer_Current_optable_size); -static TAO_Dynamic_Hash_OpTable tao_PortableServer_Current_optable (PortableServer_Current_operations, 3, 6, &_tao_PortableServer_Current_allocator); + if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) + { + const char *s = wordlist[key].opname_; + + if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) + return &wordlist[key]; + } + } + return 0; +} +/* ending time is 0:12:47 */ +TAO_PortableServer_Current_Perfect_Hash_OpTable tao_PortableServer_Current_optable; // skeleton constructor POA_PortableServer::Current::Current (void) @@ -2745,80 +3311,55 @@ void POA_PortableServer::Current::get_POA_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel PortableServer_Current_get_POA_paramdata [] = - { - {PortableServer::_tc_POA, 0, 0} - }; // PortableServer_Current_get_POA_paramdata - - static const TAO_Call_Data_Skel PortableServer_Current_get_POA_calldata = - {"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata}; - POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference; - CORBA::Object_ptr _tao_retval = CORBA::Object::_nil (); - _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_Current_get_POA_calldata, - &_tao_retval - ); - if (_tao_orb_environment.exception ()) return; + PortableServer::POA_var _tao_retval; _tao_retval = _tao_impl->get_POA ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_Current_get_POA_calldata, - &_tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval.in ()) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::Current::get_object_id_skel ( CORBA::ServerRequest &_tao_server_request, void *_tao_object_reference, void * /* context */, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; - static const TAO_Param_Data_Skel PortableServer_Current_get_object_id_paramdata [] = - { - {PortableServer::_tc_ObjectId, 0, 0} - }; // PortableServer_Current_get_object_id_paramdata - - static const TAO_Call_Data_Skel PortableServer_Current_get_object_id_calldata = - {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata}; - POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference; - PortableServer::ObjectId *_tao_retval = 0; - _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_Current_get_object_id_calldata, - _tao_retval - ); - if (_tao_orb_environment.exception ()) return; + PortableServer::ObjectId_var _tao_retval; _tao_retval = _tao_impl->get_object_id ( - _tao_orb_environment - ); - _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_Current_get_object_id_calldata, - _tao_retval - ); + ACE_TRY_ENV + ); + ACE_CHECK; + _tao_server_request.init_reply (ACE_TRY_ENV); + ACE_CHECK; + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); + if (!( + (_tao_out << _tao_retval.in ()) + )) + ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + } void POA_PortableServer::Current::_is_a_skel ( CORBA::ServerRequest &_tao_server_request, void * _tao_object_reference, void * /*context*/, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { - // CORBA::Environment _tao_skel_environment; static const TAO_Param_Data_Skel PortableServer_Current_is_a_paramdata [] = { {CORBA::_tc_boolean, 0, 0}, @@ -2828,69 +3369,89 @@ void POA_PortableServer::Current::_is_a_skel ( {"_is_a", 1, 2, PortableServer_Current_is_a_paramdata}; POA_PortableServer::Current_ptr _tao_impl = (POA_PortableServer::Current_ptr) _tao_object_reference; CORBA::Boolean _tao_retval; - char *_tao_value = 0; + CORBA::String_var _tao_value; _tao_server_request.demarshal ( - _tao_orb_environment, - &PortableServer_Current_is_a_calldata, - &_tao_retval, - &_tao_value - ); - if (_tao_orb_environment.exception () != 0) return; - _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment); + ACE_TRY_ENV, + &PortableServer_Current_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); + ACE_CHECK; + _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV); + ACE_CHECK; _tao_server_request.marshal ( - _tao_orb_environment, - // _tao_skel_environment, - &PortableServer_Current_is_a_calldata, - &_tao_retval, - &_tao_value - ); - CORBA::string_free (_tao_value); + ACE_TRY_ENV, + &PortableServer_Current_is_a_calldata, + &_tao_retval, + &_tao_value.inout () + ); } CORBA::Boolean POA_PortableServer::Current::_is_a ( const char* value, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { if ( - (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Current:1.0")) || - (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment)))) + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Current:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) || + (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV)))) return 1; else return 0; } +void POA_PortableServer::Current::_non_existent_skel ( + CORBA::ServerRequest &_tao_server_request, + void * /* _tao_object_reference */ , + void * /*context*/, + CORBA::Environment &ACE_TRY_ENV + ) +{ + static const TAO_Param_Data_Skel PortableServer_Current_non_existent_paramdata [] = + { + {CORBA::_tc_boolean, 0, 0} + }; + static const TAO_Call_Data_Skel PortableServer_Current_non_existent_calldata = + {"_non_existent", 1, 1, PortableServer_Current_non_existent_paramdata}; + CORBA::Boolean _tao_retval = 0; + _tao_server_request.marshal ( + ACE_TRY_ENV, + &PortableServer_Current_non_existent_calldata, + &_tao_retval + ); +} + void* POA_PortableServer::Current::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Current:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Current:1.0") == 0) return ACE_static_cast (POA_PortableServer::Current_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/Current:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0) return ACE_static_cast (POA_CORBA::Current_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) +void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { TAO_Skeleton skel; // pointer to skeleton for operation const char *opname = req.operation (); // retrieve operation name // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) - { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - } + { + ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + } else - skel (req, this, context, env); + skel (req, this, context, ACE_TRY_ENV); } const char* POA_PortableServer::Current::_interface_repository_id (void) const { - return "IDL:PortableServer/Current:1.0"; + return "IDL:omg.org/PortableServer/Current:1.0"; } POA_PortableServer::_tao_collocated_Current::_tao_collocated_Current ( @@ -2911,30 +3472,30 @@ POA_PortableServer::Current_ptr POA_PortableServer::_tao_collocated_Current::_ge CORBA::Boolean POA_PortableServer::_tao_collocated_Current::_is_a ( const char* logical_type_id, - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->_is_a ( logical_type_id, - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::POA_ptr POA_PortableServer::_tao_collocated_Current::get_POA ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->get_POA ( - _tao_orb_environment + ACE_TRY_ENV ); } PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_object_id ( - CORBA::Environment &_tao_orb_environment + CORBA::Environment &ACE_TRY_ENV ) { return this->servant_->get_object_id ( - _tao_orb_environment + ACE_TRY_ENV ); } diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h index 67e3ec768d5..a7642e1e526 100644 --- a/TAO/tao/POAS.h +++ b/TAO/tao/POAS.h @@ -22,9 +22,16 @@ #include "tao/Servant_Base.h" #include "tao/POA_CORBA.h" -class TAO_Export POA_PortableServer +#if defined (TAO_EXPORT_MACRO) +#undef TAO_EXPORT_MACRO +#endif +#define TAO_EXPORT_MACRO TAO_Export +#if defined(_MSC_VER) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +TAO_NAMESPACE POA_PortableServer { -public: #if !defined (TAO_HAS_MINIMUM_CORBA) @@ -47,6 +54,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -121,6 +130,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -196,6 +207,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -271,6 +284,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -348,6 +363,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -423,6 +440,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -498,6 +517,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -1156,6 +1177,8 @@ public: static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); + virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); @@ -1201,5 +1224,8 @@ public: #include "POAS.i" #endif // defined INLINE +#if defined(_MSC_VER) +#pragma warning(default:4250) +#endif /* _MSC_VER */ #endif /* TAO_IDL_POAS_H */ |