diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 26 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoC.cpp | 391 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoC.h | 3313 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS.cpp | 122 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS.h | 13 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS_T.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS_T.h | 6 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ImplRepoS_T.i | 9 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/diffs/ImplRepo.diff | 417 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoC.cpp.diff | 217 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoC.h.diff | 31 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoC.i.diff | 202 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS.cpp.diff | 2457 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS.h.diff | 799 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS.i.diff | 10 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS_T.cpp.diff | 0 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS_T.h.diff | 0 | ||||
| -rw-r--r-- | TAO/tao/diffs/ImplRepoS_T.i.diff | 10 |
18 files changed, 2431 insertions, 5596 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 364ce11e2a4..4b417ceb1f2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,29 @@ +Wed Aug 1 18:17:38 2001 Carlos O'Ryan <coryan@uci.edu> + + * tao/PortableServer/ImplRepoC.h: + * tao/PortableServer/ImplRepoC.i: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/ImplRepoS.h: + * tao/PortableServer/ImplRepoS.i: + * tao/PortableServer/ImplRepoS.cpp: + * tao/PortableServer/ImplRepoS_T.h: + * tao/PortableServer/ImplRepoS_T.i: + * tao/PortableServer/ImplRepoS_T.cpp: + * tao/PortableServer/diffs/ImplRepo.diff: + After Jeff's changes it was necessary to regenerate the ImplRepo + pre-compiled IDL. + + * tao/diffs/ImplRepoC.cpp.diff: + * tao/diffs/ImplRepoC.h.diff: + * tao/diffs/ImplRepoC.i.diff: + * tao/diffs/ImplRepoS.cpp.diff: + * tao/diffs/ImplRepoS.h.diff: + * tao/diffs/ImplRepoS.i.diff: + * tao/diffs/ImplRepoS_T.cpp.diff: + * tao/diffs/ImplRepoS_T.h.diff: + * tao/diffs/ImplRepoS_T.i.diff: + Move diffs to $TAO_ROOT/tao/PortableServer/ImplRepo.diff + Wed Aug 1 16:05:36 2001 Carlos O'Ryan <coryan@uci.edu> * Merged changes from the fix_886 branch diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index a675b0e8554..489662eeebb 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -39,6 +39,8 @@ #include "ImplRepoC.i" #endif /* !defined INLINE */ +int ImplementationRepository::ServerObject::_tao_class_id = 0; + // ************************************************************* // Operations for class ImplementationRepository::ServerObject_var // ************************************************************* @@ -407,7 +409,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping ( )) { - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -559,7 +561,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown ( )) { - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -776,9 +778,9 @@ ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_se ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::the_TAO_ServerObject_Remote_Proxy_Broker (); } -void ImplementationRepository::ServerObject::_tao_any_destructor (void *x) +void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer) { - ServerObject *tmp = ACE_static_cast (ServerObject*,x); + ServerObject *tmp = ACE_static_cast (ServerObject*, _tao_void_pointer); CORBA::release (tmp); } @@ -816,36 +818,50 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () &&ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer != 0 + obj->_is_collocated () && + ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer != 0 ) - { - ACE_NEW_RETURN ( - default_proxy, - ::ImplementationRepository::ServerObject ( - stub, - 1, - obj->_servant ()), - - ServerObject::_nil ()); + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::ServerObject ( + stub, + 1, + obj->_servant () + ), + ServerObject::_nil () + ); } + if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerObject (stub, 0, obj->_servant ()), ServerObject::_nil ()); - return default_proxy; - } - else - return - ACE_reinterpret_cast - ( - ServerObject_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServerObject::_narrow - ) - ) - ); + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::ServerObject ( + stub, + 0, + obj->_servant () + ), + ServerObject::_nil () + ); + } + + return default_proxy; + } + else + return + ACE_reinterpret_cast + ( + ServerObject_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServerObject::_tao_class_id + ) + ) + ); } ImplementationRepository::ServerObject_ptr @@ -871,9 +887,9 @@ void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t t void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_narrow)) + &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -1007,9 +1023,9 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnvironmentVariable, &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable) TAO_NAMESPACE_END -void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *x) +void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_tao_void_pointer) { - EnvironmentVariable *tmp = ACE_static_cast (EnvironmentVariable*,x); + EnvironmentVariable *tmp = ACE_static_cast (EnvironmentVariable*, _tao_void_pointer); delete tmp; } @@ -1135,9 +1151,9 @@ TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable> {} ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor {} -void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *x) +void ImplementationRepository::EnvironmentList::_tao_any_destructor (void *_tao_void_pointer) { - EnvironmentList *tmp = ACE_static_cast (EnvironmentList*,x); + EnvironmentList *tmp = ACE_static_cast (EnvironmentList*, _tao_void_pointer); delete tmp; } @@ -1434,9 +1450,9 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StartupOptions, &_tc_TAO_tc_ImplementationRepository_StartupOptions) TAO_NAMESPACE_END -void ImplementationRepository::StartupOptions::_tao_any_destructor (void *x) +void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_void_pointer) { - StartupOptions *tmp = ACE_static_cast (StartupOptions*,x); + StartupOptions *tmp = ACE_static_cast (StartupOptions*, _tao_void_pointer); delete tmp; } @@ -1666,9 +1682,9 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_ImplementationRepository_ServerInformation) TAO_NAMESPACE_END -void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x) +void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_tao_void_pointer) { - ServerInformation *tmp = ACE_static_cast (ServerInformation*,x); + ServerInformation *tmp = ACE_static_cast (ServerInformation*, _tao_void_pointer); delete tmp; } @@ -1759,9 +1775,9 @@ TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation> {} ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor {} -void ImplementationRepository::ServerInformationList::_tao_any_destructor (void *x) +void ImplementationRepository::ServerInformationList::_tao_any_destructor (void *_tao_void_pointer) { - ServerInformationList *tmp = ACE_static_cast (ServerInformationList*,x); + ServerInformationList *tmp = ACE_static_cast (ServerInformationList*, _tao_void_pointer); delete tmp; } @@ -2025,6 +2041,8 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList) TAO_NAMESPACE_END +int ImplementationRepository::Administration::_tao_class_id = 0; + // ************************************************************* // Operations for class ImplementationRepository::Administration_var // ************************************************************* @@ -2287,16 +2305,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, - {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + ImplementationRepository::Administration::_tc_NotFound, + ImplementationRepository::Administration::_tc_CannotActivate }; exception_list->length (2); for (CORBA::ULong i = 0; i < 2; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2404,15 +2422,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + ImplementationRepository::Administration::_tc_AlreadyRegistered }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2614,15 +2632,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2723,15 +2741,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2848,15 +2866,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running: Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2967,15 +2985,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -3076,15 +3094,15 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions ( Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -3233,11 +3251,17 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, - {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + { + "IDL:ImplementationRepository/Administration/NotFound:1.0", + ImplementationRepository::Administration::NotFound::_alloc + }, + { + "IDL:ImplementationRepository/Administration/CannotActivate:1.0", + ImplementationRepository::Administration::CannotActivate::_alloc + } }; - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -3403,10 +3427,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + { + "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", + ImplementationRepository::Administration::AlreadyRegistered::_alloc + } }; - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -3571,7 +3598,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister )) { - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -3738,10 +3765,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + { + "IDL:ImplementationRepository/Administration/NotFound:1.0", + ImplementationRepository::Administration::NotFound::_alloc + } }; - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -3906,10 +3936,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + { + "IDL:ImplementationRepository/Administration/NotFound:1.0", + ImplementationRepository::Administration::NotFound::_alloc + } }; - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -4076,7 +4109,10 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + { + "IDL:ImplementationRepository/Administration/NotFound:1.0", + ImplementationRepository::Administration::NotFound::_alloc + } }; CORBA::String_var _tao_safe_retval; @@ -4264,10 +4300,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + { + "IDL:ImplementationRepository/Administration/NotFound:1.0", + ImplementationRepository::Administration::NotFound::_alloc + } }; - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -4433,10 +4472,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + { + "IDL:ImplementationRepository/Administration/NotFound:1.0", + ImplementationRepository::Administration::NotFound::_alloc + } }; - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -4444,7 +4486,11 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find ( ACE_THROW (CORBA::INTERNAL ()); - ACE_NEW (info.ptr (), ImplementationRepository::ServerInformation); + ACE_NEW ( + info.ptr (), + ImplementationRepository::ServerInformation + ); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "find", @@ -4611,7 +4657,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( )) { - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -4619,7 +4665,11 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list ( ACE_THROW (CORBA::INTERNAL ()); - ACE_NEW (server_list.ptr (), ImplementationRepository::ServerInformationList); + ACE_NEW ( + server_list.ptr (), + ImplementationRepository::ServerInformationList + ); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "list", @@ -4850,9 +4900,9 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::the_TAO_Administration_Remote_Proxy_Broker (); } -void ImplementationRepository::Administration::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer) { - Administration *tmp = ACE_static_cast (Administration*,x); + Administration *tmp = ACE_static_cast (Administration*, _tao_void_pointer); CORBA::release (tmp); } @@ -4890,36 +4940,50 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () &&ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer != 0 + obj->_is_collocated () && + ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer != 0 ) - { - ACE_NEW_RETURN ( - default_proxy, - ::ImplementationRepository::Administration ( - stub, - 1, - obj->_servant ()), - - Administration::_nil ()); + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::Administration ( + stub, + 1, + obj->_servant () + ), + Administration::_nil () + ); } + if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::Administration (stub, 0, obj->_servant ()), Administration::_nil ()); - return default_proxy; - } - else - return - ACE_reinterpret_cast - ( - Administration_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &Administration::_narrow - ) - ) - ); + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::Administration ( + stub, + 0, + obj->_servant () + ), + Administration::_nil () + ); + } + + return default_proxy; + } + else + return + ACE_reinterpret_cast + ( + Administration_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &Administration::_tao_class_id + ) + ) + ); } ImplementationRepository::Administration_ptr @@ -4945,9 +5009,9 @@ void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_narrow)) + &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -4972,9 +5036,9 @@ ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered { } -void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destructor (void *_tao_void_pointer) { - AlreadyRegistered *tmp = ACE_static_cast (AlreadyRegistered*,x); + AlreadyRegistered *tmp = ACE_static_cast (AlreadyRegistered*, _tao_void_pointer); delete tmp; } @@ -5104,9 +5168,9 @@ ImplementationRepository::Administration::CannotActivate::~CannotActivate (void) { } -void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::CannotActivate::_tao_any_destructor (void *_tao_void_pointer) { - CannotActivate *tmp = ACE_static_cast (CannotActivate*,x); + CannotActivate *tmp = ACE_static_cast (CannotActivate*, _tao_void_pointer); delete tmp; } @@ -5249,9 +5313,9 @@ ImplementationRepository::Administration::NotFound::~NotFound (void) { } -void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *x) +void ImplementationRepository::Administration::NotFound::_tao_any_destructor (void *_tao_void_pointer) { - NotFound *tmp = ACE_static_cast (NotFound*,x); + NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer); delete tmp; } @@ -5595,6 +5659,8 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) TAO_NAMESPACE_END +int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0; + // ************************************************************* // Operations for class ImplementationRepository::ServerInformationIterator_var // ************************************************************* @@ -5998,7 +6064,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); - ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, 0); + ACE_NEW_RETURN ( + server_list.ptr (), + ImplementationRepository::ServerInformationList, + 0 + ); + TAO_GIOP_Twoway_Invocation _tao_call ( istub, "next_n", @@ -6168,7 +6239,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl: )) { - + TAO_Stub *istub = _collocated_tao_target_->_stubobj (); @@ -6385,9 +6456,9 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::the_TAO_ServerInformationIterator_Remote_Proxy_Broker (); } -void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *x) +void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer) { - ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator*,x); + ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator*, _tao_void_pointer); CORBA::release (tmp); } @@ -6425,36 +6496,50 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository if ( !CORBA::is_nil (stub->servant_orb_var ().ptr ()) && stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () && - obj->_is_collocated () &&ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer != 0 + obj->_is_collocated () && + ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer != 0 ) - { - ACE_NEW_RETURN ( - default_proxy, - ::ImplementationRepository::ServerInformationIterator ( - stub, - 1, - obj->_servant ()), - - ServerInformationIterator::_nil ()); + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::ServerInformationIterator ( + stub, + 1, + obj->_servant () + ), + ServerInformationIterator::_nil () + ); } + if (CORBA::is_nil (default_proxy)) - ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerInformationIterator (stub, 0, obj->_servant ()), ServerInformationIterator::_nil ()); - return default_proxy; - } - else - return - ACE_reinterpret_cast - ( - ServerInformationIterator_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, - &ServerInformationIterator::_narrow - ) - ) - ); + { + ACE_NEW_RETURN ( + default_proxy, + ::ImplementationRepository::ServerInformationIterator ( + stub, + 0, + obj->_servant () + ), + ServerInformationIterator::_nil () + ); + } + + return default_proxy; + } + else + return + ACE_reinterpret_cast + ( + ServerInformationIterator_ptr, + obj->_tao_QueryInterface + ( + ACE_reinterpret_cast + ( + ptr_arith_t, + &ServerInformationIterator::_tao_class_id + ) + ) + ); } ImplementationRepository::ServerInformationIterator_ptr @@ -6480,9 +6565,9 @@ void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface ( void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, - &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_narrow)) + &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index fe51203c4af..737502aa60d 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOC_H_ -#define _TAO_IDL_IMPLREPOC_H_ +#ifndef _TAO_IDL_ORIG_IMPLREPOC_H_ +#define _TAO_IDL_ORIG_IMPLREPOC_H_ #include "ace/pre.h" #include "tao/corbafwd.h" @@ -32,6 +32,7 @@ #include "tao/CDR.h" #include "tao/Any.h" #include "tao/Object.h" +#include "tao/ClientRequestInfo.h" #include "tao/Remote_Object_Proxy_Impl.h" #include "tao/Managed_Types.h" #include "tao/Sequence.h" @@ -62,40 +63,40 @@ TAO_NAMESPACE ImplementationRepository { - + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_ - + class ServerObject; typedef ServerObject *ServerObject_ptr; - + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_ - + class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var { public: ServerObject_var (void); // default constructor - ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} + ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} ServerObject_var (const ServerObject_var &); // copy constructor ~ServerObject_var (void); // destructor - + ServerObject_var &operator= (ServerObject_ptr); ServerObject_var &operator= (const ServerObject_var &); ServerObject_ptr operator-> (void) const; - + operator const ServerObject_ptr &() const; operator ServerObject_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ServerObject_ptr in (void) const; ServerObject_ptr &inout (void); ServerObject_ptr &out (void); ServerObject_ptr _retn (void); ServerObject_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ServerObject_ptr duplicate (ServerObject_ptr); @@ -106,7 +107,7 @@ TAO_NAMESPACE ImplementationRepository CORBA::Environment & ); static CORBA::Object * upcast (void *); - + private: ServerObject_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -116,11 +117,11 @@ TAO_NAMESPACE ImplementationRepository #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_ - + class TAO_PortableServer_Export ServerObject_out { public: @@ -133,24 +134,24 @@ TAO_NAMESPACE ImplementationRepository operator ServerObject_ptr &(); ServerObject_ptr &ptr (void); ServerObject_ptr operator-> (void); - + private: ServerObject_ptr &ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_ - - // Forward Classes Declaration + + // Forward Classes Declaration. class _TAO_ServerObject_Proxy_Impl; class _TAO_ServerObject_Remote_Proxy_Impl; class _TAO_ServerObject_Proxy_Broker; class _TAO_ServerObject_Remote_Proxy_Broker; - + class TAO_PortableServer_Export ServerObject : public virtual CORBA_Object { @@ -160,90 +161,92 @@ TAO_NAMESPACE ImplementationRepository typedef ServerObject_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - // the static operations + static int _tao_class_id; + + // The static operations. static ServerObject_ptr _duplicate (ServerObject_ptr obj); - + static ServerObject_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + static ServerObject_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + static ServerObject_ptr _nil (void) { return (ServerObject_ptr)0; } - + static void _tao_any_destructor (void*); - + virtual void ping ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void shutdown ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = + const CORBA::Char *type_id, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; private: _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_; - + protected: ServerObject (int collocated = 0); - + // This methods travese the inheritance tree and set the // parents piece of the given class in the right mode virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated); - + ServerObject ( - TAO_Stub *objref, + TAO_Stub *objref, CORBA::Boolean _tao_collocated = 0, TAO_Abstract_ServantBase *servant = 0 ); - + friend class _TAO_ServerObject_Remote_Proxy_Impl; friend class _TAO_ServerObject_ThruPOA_Proxy_Impl; friend class _TAO_ServerObject_Direct_Proxy_Impl; - + virtual ~ServerObject (void); - + private: ServerObject (const ServerObject &); void operator= (const ServerObject &); }; - + // The Proxy Implementations are used by each interface to // perform a call. Each different implementation encapsulate // an invocation logics. - - + + /////////////////////////////////////////////////////////////////////// // Base Proxy Impl. Declaration // - + class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl { @@ -256,7 +259,7 @@ TAO_NAMESPACE ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + virtual void shutdown ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -264,28 +267,28 @@ TAO_NAMESPACE ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - - + + protected: _TAO_ServerObject_Proxy_Impl (void); }; - + // // End Base Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// // Remote Proxy Impl. Declaration // - + class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : public virtual _TAO_ServerObject_Proxy_Impl, public virtual TAO_Remote_Object_Proxy_Impl { public: _TAO_ServerObject_Remote_Proxy_Impl (void); - + virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { } virtual void ping ( CORBA_Object *_collocated_tao_target_, @@ -294,7 +297,7 @@ TAO_NAMESPACE ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - + virtual void shutdown ( CORBA_Object *_collocated_tao_target_, CORBA::Environment &ACE_TRY_ENV @@ -302,24 +305,24 @@ TAO_NAMESPACE ImplementationRepository ACE_THROW_SPEC (( CORBA::SystemException )); - - + + }; - + // // End Remote Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - + // The Proxy Brokers are used by each interface to get - // the right proxy for performing a call. In the new + // the right proxy for performing a call. In the new // collocation scheme, the proxy to be used can vary on // a call by call basis. - - + + /////////////////////////////////////////////////////////////////////// - // Base Proxy Broker Declaration + // Base Proxy Broker Declaration // - + class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker { public: @@ -328,1739 +331,1743 @@ TAO_NAMESPACE ImplementationRepository ServerObject *object, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ) = 0; - + protected: _TAO_ServerObject_Proxy_Broker (void); - + }; - + // - // End Base Proxy Broker Declaration + // End Base Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - + + /////////////////////////////////////////////////////////////////////// - // Remote Proxy Broker Declaration + // Remote Proxy Broker Declaration // - + class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker : public virtual _TAO_ServerObject_Proxy_Broker { - public: + public: _TAO_ServerObject_Remote_Proxy_Broker (void); - + virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void); - + virtual _TAO_ServerObject_Proxy_Impl &select_proxy ( ServerObject *object, CORBA_Environment &ACE_TRY_ENV ); - - private: - _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_; - - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void); - }; - - // - // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - + + private: + _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_; + + public: + // This member function is used to get an handle to the unique instance + // of the Remote Proxy Broker that is available for a given + // interface. + static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void); + }; + + // + // End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject; - - struct EnvironmentVariable; - class EnvironmentVariable_var; - - struct TAO_PortableServer_Export EnvironmentVariable - { - + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject; + + struct EnvironmentVariable; + class EnvironmentVariable_var; + + struct TAO_PortableServer_Export EnvironmentVariable + { + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef EnvironmentVariable_var _var_type; + typedef EnvironmentVariable_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static void _tao_any_destructor (void*); - - TAO_String_Manager name; - TAO_String_Manager value; - - }; - - class TAO_PortableServer_Export EnvironmentVariable_var - { - public: - EnvironmentVariable_var (void); - EnvironmentVariable_var (EnvironmentVariable *); - EnvironmentVariable_var (const EnvironmentVariable_var &); - ~EnvironmentVariable_var (void); - - EnvironmentVariable_var &operator= (EnvironmentVariable *); - EnvironmentVariable_var &operator= (const EnvironmentVariable_var &); - EnvironmentVariable *operator-> (void); - const EnvironmentVariable *operator-> (void) const; - - operator const EnvironmentVariable &() const; - operator EnvironmentVariable &(); - operator EnvironmentVariable &() const; - // Variable-size types only. - operator EnvironmentVariable *&(); - - // in, inout, out, _retn - const EnvironmentVariable &in (void) const; - EnvironmentVariable &inout (void); - EnvironmentVariable *&out (void); - EnvironmentVariable *_retn (void); - EnvironmentVariable *ptr (void) const; - - private: - EnvironmentVariable *ptr_; - }; - - class TAO_PortableServer_Export EnvironmentVariable_out - { - public: - EnvironmentVariable_out (EnvironmentVariable *&); - EnvironmentVariable_out (EnvironmentVariable_var &); - EnvironmentVariable_out (const EnvironmentVariable_out &); - EnvironmentVariable_out &operator= (const EnvironmentVariable_out &); - EnvironmentVariable_out &operator= (EnvironmentVariable *); - operator EnvironmentVariable *&(); - EnvironmentVariable *&ptr (void); - EnvironmentVariable *operator-> (void); - - private: - EnvironmentVariable *&ptr_; - // Assignment from T_var not allowed. - void operator= (const EnvironmentVariable_var &); - }; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentVariable; - - typedef char * Address; - typedef CORBA::String_var Address_var; - typedef CORBA::String_out Address_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; - - + static void _tao_any_destructor (void*); + + TAO_String_Manager name; + TAO_String_Manager value; + + }; + + class TAO_PortableServer_Export EnvironmentVariable_var + { + public: + EnvironmentVariable_var (void); + EnvironmentVariable_var (EnvironmentVariable *); + EnvironmentVariable_var (const EnvironmentVariable_var &); + ~EnvironmentVariable_var (void); + + EnvironmentVariable_var &operator= (EnvironmentVariable *); + EnvironmentVariable_var &operator= (const EnvironmentVariable_var &); + EnvironmentVariable *operator-> (void); + const EnvironmentVariable *operator-> (void) const; + + operator const EnvironmentVariable &() const; + operator EnvironmentVariable &(); + operator EnvironmentVariable &() const; + // Variable-size types only. + operator EnvironmentVariable *&(); + + // in, inout, out, _retn + const EnvironmentVariable &in (void) const; + EnvironmentVariable &inout (void); + EnvironmentVariable *&out (void); + EnvironmentVariable *_retn (void); + EnvironmentVariable *ptr (void) const; + + private: + EnvironmentVariable *ptr_; + }; + + class TAO_PortableServer_Export EnvironmentVariable_out + { + public: + EnvironmentVariable_out (EnvironmentVariable *&); + EnvironmentVariable_out (EnvironmentVariable_var &); + EnvironmentVariable_out (const EnvironmentVariable_out &); + EnvironmentVariable_out &operator= (const EnvironmentVariable_out &); + EnvironmentVariable_out &operator= (EnvironmentVariable *); + operator EnvironmentVariable *&(); + EnvironmentVariable *&ptr (void); + EnvironmentVariable *operator-> (void); + + private: + EnvironmentVariable *&ptr_; + // Assignment from T_var not allowed. + void operator= (const EnvironmentVariable_var &); + }; + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentVariable; + + typedef char * Address; + typedef CORBA::String_var Address_var; + typedef CORBA::String_out Address_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address; + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList - : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList ( - CORBA::ULong maximum, - CORBA::ULong length, - EnvironmentVariable *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList ( - const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs - ); - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &operator= ( - const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs - ); - virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); - - // = Accessors. - EnvironmentVariable &operator[] (CORBA::ULong i); - const EnvironmentVariable &operator[] (CORBA::ULong i) const; - - // = Static operations. - static EnvironmentVariable *allocbuf (CORBA::ULong size); - static void freebuf (EnvironmentVariable *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0); - const EnvironmentVariable *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - EnvironmentVariable *data, - CORBA::Boolean release - ); - }; - + + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList ( + CORBA::ULong maximum, + CORBA::ULong length, + EnvironmentVariable *data, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList ( + const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs + ); + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &operator= ( + const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs + ); + virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); + + // = Accessors. + EnvironmentVariable &operator[] (CORBA::ULong i); + const EnvironmentVariable &operator[] (CORBA::ULong i) const; + + // = Static operations. + static EnvironmentVariable *allocbuf (CORBA::ULong size); + static void freebuf (EnvironmentVariable *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0); + const EnvironmentVariable *get_buffer (void) const; + void replace ( + CORBA::ULong max, + CORBA::ULong length, + EnvironmentVariable *data, + CORBA::Boolean release + ); + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_ - - class EnvironmentList; - class EnvironmentList_var; - - // ************************************************************* - // EnvironmentList - // ************************************************************* - - class TAO_PortableServer_Export EnvironmentList : public + + class EnvironmentList; + class EnvironmentList_var; + + // ************************************************************* + // EnvironmentList + // ************************************************************* + + class TAO_PortableServer_Export EnvironmentList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList + _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<EnvironmentVariable> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - EnvironmentList (void); // default ctor - EnvironmentList (CORBA::ULong max); // uses max size - EnvironmentList ( - CORBA::ULong max, - CORBA::ULong length, - EnvironmentVariable *buffer, - CORBA::Boolean release = 0 - ); - EnvironmentList (const EnvironmentList &); // copy ctor - ~EnvironmentList (void); - static void _tao_any_destructor (void*); - + TAO_Unbounded_Sequence<EnvironmentVariable> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + EnvironmentList (void); // default ctor + EnvironmentList (CORBA::ULong max); // uses max size + EnvironmentList ( + CORBA::ULong max, + CORBA::ULong length, + EnvironmentVariable *buffer, + CORBA::Boolean release = 0 + ); + EnvironmentList (const EnvironmentList &); // copy ctor + ~EnvironmentList (void); + static void _tao_any_destructor (void*); + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef EnvironmentList_var _var_type; + typedef EnvironmentList_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - - - }; - + + + }; + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_ - - // ************************************************************* - // class ImplementationRepository::EnvironmentList_var - // ************************************************************* - - class TAO_PortableServer_Export EnvironmentList_var - { - public: - EnvironmentList_var (void); - EnvironmentList_var (EnvironmentList *); - EnvironmentList_var (const EnvironmentList_var &); - ~EnvironmentList_var (void); - - EnvironmentList_var &operator= (EnvironmentList *); - EnvironmentList_var &operator= (const EnvironmentList_var &); - EnvironmentList *operator-> (void); - const EnvironmentList *operator-> (void) const; - - operator const EnvironmentList &() const; - operator EnvironmentList &(); - operator EnvironmentList &() const; - operator EnvironmentList *&(); // variable-size base types only - - EnvironmentVariable & operator[] (CORBA::ULong index); - const EnvironmentVariable & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const EnvironmentList &in (void) const; - EnvironmentList &inout (void); - EnvironmentList *&out (void); - EnvironmentList *_retn (void); - EnvironmentList *ptr (void) const; - - private: - EnvironmentList *ptr_; - }; - - + + // ************************************************************* + // class ImplementationRepository::EnvironmentList_var + // ************************************************************* + + class TAO_PortableServer_Export EnvironmentList_var + { + public: + EnvironmentList_var (void); + EnvironmentList_var (EnvironmentList *); + EnvironmentList_var (const EnvironmentList_var &); + ~EnvironmentList_var (void); + + EnvironmentList_var &operator= (EnvironmentList *); + EnvironmentList_var &operator= (const EnvironmentList_var &); + EnvironmentList *operator-> (void); + const EnvironmentList *operator-> (void) const; + + operator const EnvironmentList &() const; + operator EnvironmentList &(); + operator EnvironmentList &() const; + operator EnvironmentList *&(); // variable-size base types only + + EnvironmentVariable & operator[] (CORBA::ULong index); + const EnvironmentVariable & operator[] (CORBA::ULong index) const; + + // in, inout, out, _retn + const EnvironmentList &in (void) const; + EnvironmentList &inout (void); + EnvironmentList *&out (void); + EnvironmentList *_retn (void); + EnvironmentList *ptr (void) const; + + private: + EnvironmentList *ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_ - - class TAO_PortableServer_Export EnvironmentList_out - { - public: - EnvironmentList_out (EnvironmentList *&); - EnvironmentList_out (EnvironmentList_var &); - EnvironmentList_out (const EnvironmentList_out &); - EnvironmentList_out &operator= (const EnvironmentList_out &); - EnvironmentList_out &operator= (EnvironmentList *); - operator EnvironmentList *&(); - EnvironmentList *&ptr (void); - EnvironmentList *operator-> (void); - EnvironmentVariable & operator[] (CORBA::ULong index); - - private: - EnvironmentList *&ptr_; - // Assignment from T_var not allowed. - void operator= (const EnvironmentList_var &); - }; - - + + class TAO_PortableServer_Export EnvironmentList_out + { + public: + EnvironmentList_out (EnvironmentList *&); + EnvironmentList_out (EnvironmentList_var &); + EnvironmentList_out (const EnvironmentList_out &); + EnvironmentList_out &operator= (const EnvironmentList_out &); + EnvironmentList_out &operator= (EnvironmentList *); + operator EnvironmentList *&(); + EnvironmentList *&ptr (void); + EnvironmentList *operator-> (void); + EnvironmentVariable & operator[] (CORBA::ULong index); + + private: + EnvironmentList *&ptr_; + // Assignment from T_var not allowed. + void operator= (const EnvironmentList_var &); + }; + + #endif /* end #if !defined */ - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentList; - - enum ActivationMode - { - NORMAL, - MANUAL, - PER_CLIENT, - AUTO_START - }; - - typedef ActivationMode &ActivationMode_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode; - - struct StartupOptions; - class StartupOptions_var; - - struct TAO_PortableServer_Export StartupOptions - { - + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentList; + + enum ActivationMode + { + NORMAL, + MANUAL, + PER_CLIENT, + AUTO_START + }; + + typedef ActivationMode &ActivationMode_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode; + + struct StartupOptions; + class StartupOptions_var; + + struct TAO_PortableServer_Export StartupOptions + { + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef StartupOptions_var _var_type; + typedef StartupOptions_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static void _tao_any_destructor (void*); - - TAO_String_Manager command_line; - ACE_NESTED_CLASS (ImplementationRepository, EnvironmentList) environment; - TAO_String_Manager working_directory; - ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation; - - }; - - class TAO_PortableServer_Export StartupOptions_var - { - public: - StartupOptions_var (void); - StartupOptions_var (StartupOptions *); - StartupOptions_var (const StartupOptions_var &); - ~StartupOptions_var (void); - - StartupOptions_var &operator= (StartupOptions *); - StartupOptions_var &operator= (const StartupOptions_var &); - StartupOptions *operator-> (void); - const StartupOptions *operator-> (void) const; - - operator const StartupOptions &() const; - operator StartupOptions &(); - operator StartupOptions &() const; - // Variable-size types only. - operator StartupOptions *&(); - - // in, inout, out, _retn - const StartupOptions &in (void) const; - StartupOptions &inout (void); - StartupOptions *&out (void); - StartupOptions *_retn (void); - StartupOptions *ptr (void) const; - - private: - StartupOptions *ptr_; - }; - - class TAO_PortableServer_Export StartupOptions_out - { - public: - StartupOptions_out (StartupOptions *&); - StartupOptions_out (StartupOptions_var &); - StartupOptions_out (const StartupOptions_out &); - StartupOptions_out &operator= (const StartupOptions_out &); - StartupOptions_out &operator= (StartupOptions *); - operator StartupOptions *&(); - StartupOptions *&ptr (void); - StartupOptions *operator-> (void); - - private: - StartupOptions *&ptr_; - // Assignment from T_var not allowed. - void operator= (const StartupOptions_var &); - }; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions; - - struct ServerInformation; - class ServerInformation_var; - - struct TAO_PortableServer_Export ServerInformation - { - + static void _tao_any_destructor (void*); + + TAO_String_Manager command_line; + ACE_NESTED_CLASS (ImplementationRepository, EnvironmentList) environment; + TAO_String_Manager working_directory; + ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation; + + }; + + class TAO_PortableServer_Export StartupOptions_var + { + public: + StartupOptions_var (void); + StartupOptions_var (StartupOptions *); + StartupOptions_var (const StartupOptions_var &); + ~StartupOptions_var (void); + + StartupOptions_var &operator= (StartupOptions *); + StartupOptions_var &operator= (const StartupOptions_var &); + StartupOptions *operator-> (void); + const StartupOptions *operator-> (void) const; + + operator const StartupOptions &() const; + operator StartupOptions &(); + operator StartupOptions &() const; + // Variable-size types only. + operator StartupOptions *&(); + + // in, inout, out, _retn + const StartupOptions &in (void) const; + StartupOptions &inout (void); + StartupOptions *&out (void); + StartupOptions *_retn (void); + StartupOptions *ptr (void) const; + + private: + StartupOptions *ptr_; + }; + + class TAO_PortableServer_Export StartupOptions_out + { + public: + StartupOptions_out (StartupOptions *&); + StartupOptions_out (StartupOptions_var &); + StartupOptions_out (const StartupOptions_out &); + StartupOptions_out &operator= (const StartupOptions_out &); + StartupOptions_out &operator= (StartupOptions *); + operator StartupOptions *&(); + StartupOptions *&ptr (void); + StartupOptions *operator-> (void); + + private: + StartupOptions *&ptr_; + // Assignment from T_var not allowed. + void operator= (const StartupOptions_var &); + }; + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions; + + struct ServerInformation; + class ServerInformation_var; + + struct TAO_PortableServer_Export ServerInformation + { + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef ServerInformation_var _var_type; + typedef ServerInformation_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - static void _tao_any_destructor (void*); - - TAO_String_Manager logical_server; - TAO_String_Manager server; - ACE_NESTED_CLASS (ImplementationRepository, StartupOptions) startup; - TAO_String_Manager location; - - }; - - class TAO_PortableServer_Export ServerInformation_var - { - public: - ServerInformation_var (void); - ServerInformation_var (ServerInformation *); - ServerInformation_var (const ServerInformation_var &); - ~ServerInformation_var (void); - - ServerInformation_var &operator= (ServerInformation *); - ServerInformation_var &operator= (const ServerInformation_var &); - ServerInformation *operator-> (void); - const ServerInformation *operator-> (void) const; - - operator const ServerInformation &() const; - operator ServerInformation &(); - operator ServerInformation &() const; - // Variable-size types only. - operator ServerInformation *&(); - - // in, inout, out, _retn - const ServerInformation &in (void) const; - ServerInformation &inout (void); - ServerInformation *&out (void); - ServerInformation *_retn (void); - ServerInformation *ptr (void) const; - - private: - ServerInformation *ptr_; - }; - - class TAO_PortableServer_Export ServerInformation_out - { - public: - ServerInformation_out (ServerInformation *&); - ServerInformation_out (ServerInformation_var &); - ServerInformation_out (const ServerInformation_out &); - ServerInformation_out &operator= (const ServerInformation_out &); - ServerInformation_out &operator= (ServerInformation *); - operator ServerInformation *&(); - ServerInformation *&ptr (void); - ServerInformation *operator-> (void); - - private: - ServerInformation *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ServerInformation_var &); - }; - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; - - + static void _tao_any_destructor (void*); + + TAO_String_Manager logical_server; + TAO_String_Manager server; + ACE_NESTED_CLASS (ImplementationRepository, StartupOptions) startup; + TAO_String_Manager location; + + }; + + class TAO_PortableServer_Export ServerInformation_var + { + public: + ServerInformation_var (void); + ServerInformation_var (ServerInformation *); + ServerInformation_var (const ServerInformation_var &); + ~ServerInformation_var (void); + + ServerInformation_var &operator= (ServerInformation *); + ServerInformation_var &operator= (const ServerInformation_var &); + ServerInformation *operator-> (void); + const ServerInformation *operator-> (void) const; + + operator const ServerInformation &() const; + operator ServerInformation &(); + operator ServerInformation &() const; + // Variable-size types only. + operator ServerInformation *&(); + + // in, inout, out, _retn + const ServerInformation &in (void) const; + ServerInformation &inout (void); + ServerInformation *&out (void); + ServerInformation *_retn (void); + ServerInformation *ptr (void) const; + + private: + ServerInformation *ptr_; + }; + + class TAO_PortableServer_Export ServerInformation_out + { + public: + ServerInformation_out (ServerInformation *&); + ServerInformation_out (ServerInformation_var &); + ServerInformation_out (const ServerInformation_out &); + ServerInformation_out &operator= (const ServerInformation_out &); + ServerInformation_out &operator= (ServerInformation *); + operator ServerInformation *&(); + ServerInformation *&ptr (void); + ServerInformation *operator-> (void); + + private: + ServerInformation *&ptr_; + // Assignment from T_var not allowed. + void operator= (const ServerInformation_var &); + }; + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation; + + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ - - class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList - : public TAO_Unbounded_Base_Sequence - { - public: - // = Initialization and termination methods. - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList ( - CORBA::ULong maximum, - CORBA::ULong length, - ServerInformation *data, - CORBA::Boolean release = 0 - ); - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList ( - const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs - ); - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &operator= ( - const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs - ); - virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); - - // = Accessors. - ServerInformation &operator[] (CORBA::ULong i); - const ServerInformation &operator[] (CORBA::ULong i) const; - - // = Static operations. - static ServerInformation *allocbuf (CORBA::ULong size); - static void freebuf (ServerInformation *buffer); - - // Implement the TAO_Base_Sequence methods (see Sequence.h) - virtual void _allocate_buffer (CORBA::ULong length); - virtual void _deallocate_buffer (void); - ServerInformation *get_buffer (CORBA::Boolean orphan = 0); - const ServerInformation *get_buffer (void) const; - void replace ( - CORBA::ULong max, - CORBA::ULong length, - ServerInformation *data, - CORBA::Boolean release - ); - }; - + + class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList + : public TAO_Unbounded_Base_Sequence + { + public: + // = Initialization and termination methods. + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList ( + CORBA::ULong maximum, + CORBA::ULong length, + ServerInformation *data, + CORBA::Boolean release = 0 + ); + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList ( + const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs + ); + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &operator= ( + const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs + ); + virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); + + // = Accessors. + ServerInformation &operator[] (CORBA::ULong i); + const ServerInformation &operator[] (CORBA::ULong i) const; + + // = Static operations. + static ServerInformation *allocbuf (CORBA::ULong size); + static void freebuf (ServerInformation *buffer); + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + virtual void _allocate_buffer (CORBA::ULong length); + virtual void _deallocate_buffer (void); + ServerInformation *get_buffer (CORBA::Boolean orphan = 0); + const ServerInformation *get_buffer (void) const; + void replace ( + CORBA::ULong max, + CORBA::ULong length, + ServerInformation *data, + CORBA::Boolean release + ); + }; + #endif /* end #if !defined */ - - -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + + +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_ - - class ServerInformationList; - class ServerInformationList_var; - - // ************************************************************* - // ServerInformationList - // ************************************************************* - - class TAO_PortableServer_Export ServerInformationList : public + + class ServerInformationList; + class ServerInformationList_var; + + // ************************************************************* + // ServerInformationList + // ************************************************************* + + class TAO_PortableServer_Export ServerInformationList : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList + _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList #else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_Sequence<ServerInformation> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - ServerInformationList (void); // default ctor - ServerInformationList (CORBA::ULong max); // uses max size - ServerInformationList ( - CORBA::ULong max, - CORBA::ULong length, - ServerInformation *buffer, - CORBA::Boolean release = 0 - ); - ServerInformationList (const ServerInformationList &); // copy ctor - ~ServerInformationList (void); - static void _tao_any_destructor (void*); - + TAO_Unbounded_Sequence<ServerInformation> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + ServerInformationList (void); // default ctor + ServerInformationList (CORBA::ULong max); // uses max size + ServerInformationList ( + CORBA::ULong max, + CORBA::ULong length, + ServerInformation *buffer, + CORBA::Boolean release = 0 + ); + ServerInformationList (const ServerInformationList &); // copy ctor + ~ServerInformationList (void); + static void _tao_any_destructor (void*); + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef ServerInformationList_var _var_type; + typedef ServerInformationList_var _var_type; #endif /* ! __GNUC__ || g++ >= 2.8 */ - - - }; - + + + }; + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_ - - // ************************************************************* - // class ImplementationRepository::ServerInformationList_var - // ************************************************************* - - class TAO_PortableServer_Export ServerInformationList_var - { - public: - ServerInformationList_var (void); - ServerInformationList_var (ServerInformationList *); - ServerInformationList_var (const ServerInformationList_var &); - ~ServerInformationList_var (void); - - ServerInformationList_var &operator= (ServerInformationList *); - ServerInformationList_var &operator= (const ServerInformationList_var &); - ServerInformationList *operator-> (void); - const ServerInformationList *operator-> (void) const; - - operator const ServerInformationList &() const; - operator ServerInformationList &(); - operator ServerInformationList &() const; - operator ServerInformationList *&(); // variable-size base types only - - ServerInformation & operator[] (CORBA::ULong index); - const ServerInformation & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn - const ServerInformationList &in (void) const; - ServerInformationList &inout (void); - ServerInformationList *&out (void); - ServerInformationList *_retn (void); - ServerInformationList *ptr (void) const; - - private: - ServerInformationList *ptr_; - }; - - + + // ************************************************************* + // class ImplementationRepository::ServerInformationList_var + // ************************************************************* + + class TAO_PortableServer_Export ServerInformationList_var + { + public: + ServerInformationList_var (void); + ServerInformationList_var (ServerInformationList *); + ServerInformationList_var (const ServerInformationList_var &); + ~ServerInformationList_var (void); + + ServerInformationList_var &operator= (ServerInformationList *); + ServerInformationList_var &operator= (const ServerInformationList_var &); + ServerInformationList *operator-> (void); + const ServerInformationList *operator-> (void) const; + + operator const ServerInformationList &() const; + operator ServerInformationList &(); + operator ServerInformationList &() const; + operator ServerInformationList *&(); // variable-size base types only + + ServerInformation & operator[] (CORBA::ULong index); + const ServerInformation & operator[] (CORBA::ULong index) const; + + // in, inout, out, _retn + const ServerInformationList &in (void) const; + ServerInformationList &inout (void); + ServerInformationList *&out (void); + ServerInformationList *_retn (void); + ServerInformationList *ptr (void) const; + + private: + ServerInformationList *ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_ - - class TAO_PortableServer_Export ServerInformationList_out - { - public: - ServerInformationList_out (ServerInformationList *&); - ServerInformationList_out (ServerInformationList_var &); - ServerInformationList_out (const ServerInformationList_out &); - ServerInformationList_out &operator= (const ServerInformationList_out &); - ServerInformationList_out &operator= (ServerInformationList *); - operator ServerInformationList *&(); - ServerInformationList *&ptr (void); - ServerInformationList *operator-> (void); - ServerInformation & operator[] (CORBA::ULong index); - - private: - ServerInformationList *&ptr_; - // Assignment from T_var not allowed. - void operator= (const ServerInformationList_var &); - }; - - + + class TAO_PortableServer_Export ServerInformationList_out + { + public: + ServerInformationList_out (ServerInformationList *&); + ServerInformationList_out (ServerInformationList_var &); + ServerInformationList_out (const ServerInformationList_out &); + ServerInformationList_out &operator= (const ServerInformationList_out &); + ServerInformationList_out &operator= (ServerInformationList *); + operator ServerInformationList *&(); + ServerInformationList *&ptr (void); + ServerInformationList *operator-> (void); + ServerInformation & operator[] (CORBA::ULong index); + + private: + ServerInformationList *&ptr_; + // Assignment from T_var not allowed. + void operator= (const ServerInformationList_var &); + }; + + #endif /* end #if !defined */ - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationList; - - class ServerInformationIterator; - + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationList; + + class ServerInformationIterator; + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_ - - typedef ServerInformationIterator *ServerInformationIterator_ptr; - + + typedef ServerInformationIterator *ServerInformationIterator_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_ - - class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var - { - public: - ServerInformationIterator_var (void); // default constructor - ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} - ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor - ~ServerInformationIterator_var (void); // destructor - - ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); - ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); - ServerInformationIterator_ptr operator-> (void) const; - - operator const ServerInformationIterator_ptr &() const; - operator ServerInformationIterator_ptr &(); - // in, inout, out, _retn - ServerInformationIterator_ptr in (void) const; - ServerInformationIterator_ptr &inout (void); - ServerInformationIterator_ptr &out (void); - ServerInformationIterator_ptr _retn (void); - ServerInformationIterator_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static ServerInformationIterator_ptr duplicate (ServerInformationIterator_ptr); - static void release (ServerInformationIterator_ptr); - static ServerInformationIterator_ptr nil (void); - static ServerInformationIterator_ptr narrow ( - CORBA::Object *, - CORBA::Environment & - ); - static CORBA::Object * upcast (void *); - - private: - ServerInformationIterator_ptr ptr_; - // Unimplemented - prevents widening assignment. - ServerInformationIterator_var (const TAO_Base_var &rhs); - ServerInformationIterator_var &operator= (const TAO_Base_var &rhs); - }; + + class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var + { + public: + ServerInformationIterator_var (void); // default constructor + ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} + ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor + ~ServerInformationIterator_var (void); // destructor + + ServerInformationIterator_var &operator= (ServerInformationIterator_ptr); + ServerInformationIterator_var &operator= (const ServerInformationIterator_var &); + ServerInformationIterator_ptr operator-> (void) const; + + operator const ServerInformationIterator_ptr &() const; + operator ServerInformationIterator_ptr &(); + // in, inout, out, _retn + ServerInformationIterator_ptr in (void) const; + ServerInformationIterator_ptr &inout (void); + ServerInformationIterator_ptr &out (void); + ServerInformationIterator_ptr _retn (void); + ServerInformationIterator_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static ServerInformationIterator_ptr duplicate (ServerInformationIterator_ptr); + static void release (ServerInformationIterator_ptr); + static ServerInformationIterator_ptr nil (void); + static ServerInformationIterator_ptr narrow ( + CORBA::Object *, + CORBA::Environment & + ); + static CORBA::Object * upcast (void *); + + private: + ServerInformationIterator_ptr ptr_; + // Unimplemented - prevents widening assignment. + ServerInformationIterator_var (const TAO_Base_var &rhs); + ServerInformationIterator_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_ - - class TAO_PortableServer_Export ServerInformationIterator_out - { - public: - ServerInformationIterator_out (ServerInformationIterator_ptr &); - ServerInformationIterator_out (ServerInformationIterator_var &); - ServerInformationIterator_out (const ServerInformationIterator_out &); - ServerInformationIterator_out &operator= (const ServerInformationIterator_out &); - ServerInformationIterator_out &operator= (const ServerInformationIterator_var &); - ServerInformationIterator_out &operator= (ServerInformationIterator_ptr); - operator ServerInformationIterator_ptr &(); - ServerInformationIterator_ptr &ptr (void); - ServerInformationIterator_ptr operator-> (void); - - private: - ServerInformationIterator_ptr &ptr_; - }; - - + + class TAO_PortableServer_Export ServerInformationIterator_out + { + public: + ServerInformationIterator_out (ServerInformationIterator_ptr &); + ServerInformationIterator_out (ServerInformationIterator_var &); + ServerInformationIterator_out (const ServerInformationIterator_out &); + ServerInformationIterator_out &operator= (const ServerInformationIterator_out &); + ServerInformationIterator_out &operator= (const ServerInformationIterator_var &); + ServerInformationIterator_out &operator= (ServerInformationIterator_ptr); + operator ServerInformationIterator_ptr &(); + ServerInformationIterator_ptr &ptr (void); + ServerInformationIterator_ptr operator-> (void); + + private: + ServerInformationIterator_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_ - - class Administration; - typedef Administration *Administration_ptr; - + + class Administration; + typedef Administration *Administration_ptr; + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_ - - class TAO_PortableServer_Export Administration_var : public TAO_Base_var - { - public: - Administration_var (void); // default constructor - Administration_var (Administration_ptr p) : ptr_ (p) {} - Administration_var (const Administration_var &); // copy constructor - ~Administration_var (void); // destructor - - Administration_var &operator= (Administration_ptr); - Administration_var &operator= (const Administration_var &); - Administration_ptr operator-> (void) const; - - operator const Administration_ptr &() const; - operator Administration_ptr &(); - // in, inout, out, _retn - Administration_ptr in (void) const; - Administration_ptr &inout (void); - Administration_ptr &out (void); - Administration_ptr _retn (void); - Administration_ptr ptr (void) const; - - // Hooks used by template sequence and object manager classes - // for non-defined forward declared interfaces. - static Administration_ptr duplicate (Administration_ptr); - static void release (Administration_ptr); - static Administration_ptr nil (void); - static Administration_ptr narrow ( - CORBA::Object *, - CORBA::Environment & - ); - static CORBA::Object * upcast (void *); - - private: - Administration_ptr ptr_; - // Unimplemented - prevents widening assignment. - Administration_var (const TAO_Base_var &rhs); - Administration_var &operator= (const TAO_Base_var &rhs); - }; + + class TAO_PortableServer_Export Administration_var : public TAO_Base_var + { + public: + Administration_var (void); // default constructor + Administration_var (Administration_ptr p) : ptr_ (p) {} + Administration_var (const Administration_var &); // copy constructor + ~Administration_var (void); // destructor + + Administration_var &operator= (Administration_ptr); + Administration_var &operator= (const Administration_var &); + Administration_ptr operator-> (void) const; + + operator const Administration_ptr &() const; + operator Administration_ptr &(); + // in, inout, out, _retn + Administration_ptr in (void) const; + Administration_ptr &inout (void); + Administration_ptr &out (void); + Administration_ptr _retn (void); + Administration_ptr ptr (void) const; + + // Hooks used by template sequence and object manager classes + // for non-defined forward declared interfaces. + static Administration_ptr duplicate (Administration_ptr); + static void release (Administration_ptr); + static Administration_ptr nil (void); + static Administration_ptr narrow ( + CORBA::Object *, + CORBA::Environment & + ); + static CORBA::Object * upcast (void *); + + private: + Administration_ptr ptr_; + // Unimplemented - prevents widening assignment. + Administration_var (const TAO_Base_var &rhs); + Administration_var &operator= (const TAO_Base_var &rhs); + }; #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_ - - class TAO_PortableServer_Export Administration_out - { - public: - Administration_out (Administration_ptr &); - Administration_out (Administration_var &); - Administration_out (const Administration_out &); - Administration_out &operator= (const Administration_out &); - Administration_out &operator= (const Administration_var &); - Administration_out &operator= (Administration_ptr); - operator Administration_ptr &(); - Administration_ptr &ptr (void); - Administration_ptr operator-> (void); - - private: - Administration_ptr &ptr_; - }; - - + + class TAO_PortableServer_Export Administration_out + { + public: + Administration_out (Administration_ptr &); + Administration_out (Administration_var &); + Administration_out (const Administration_out &); + Administration_out &operator= (const Administration_out &); + Administration_out &operator= (const Administration_var &); + Administration_out &operator= (Administration_ptr); + operator Administration_ptr &(); + Administration_ptr &ptr (void); + Administration_ptr operator-> (void); + + private: + Administration_ptr &ptr_; + }; + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_ + + // Forward Classes Declaration. + class _TAO_Administration_Proxy_Impl; + class _TAO_Administration_Remote_Proxy_Impl; + class _TAO_Administration_Proxy_Broker; + class _TAO_Administration_Remote_Proxy_Broker; + + class TAO_PortableServer_Export Administration + : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef Administration_ptr _ptr_type; + typedef Administration_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ - // Forward Classes Declaration - class _TAO_Administration_Proxy_Impl; - class _TAO_Administration_Remote_Proxy_Impl; - class _TAO_Administration_Proxy_Broker; - class _TAO_Administration_Remote_Proxy_Broker; - - class TAO_PortableServer_Export Administration - : public virtual CORBA_Object + static int _tao_class_id; + + // The static operations. + static Administration_ptr _duplicate (Administration_ptr obj); + + static Administration_ptr _narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static Administration_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static Administration_ptr _nil (void) + { + return (Administration_ptr)0; + } + + static void _tao_any_destructor (void*); + + +#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_) +#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_ + + class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException { public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef Administration_ptr _ptr_type; - typedef Administration_var _var_type; - #endif /* ! __GNUC__ || g++ >= 2.8 */ - - // the static operations - static Administration_ptr _duplicate (Administration_ptr obj); - - static Administration_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - static Administration_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - static Administration_ptr _nil (void) - { - return (Administration_ptr)0; - } - + + AlreadyRegistered (void); + // Default constructor. + + AlreadyRegistered (const AlreadyRegistered &); + // Copy constructor. + + ~AlreadyRegistered (void); + // Destructor. + static void _tao_any_destructor (void*); + + AlreadyRegistered &operator= (const AlreadyRegistered &); + + virtual void _raise (void); - -#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_) -#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_ - - class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException - { - public: - - AlreadyRegistered (void); - // Default constructor. - - AlreadyRegistered (const AlreadyRegistered &); - // Copy constructor. - - ~AlreadyRegistered (void); - // Destructor. - - static void _tao_any_destructor (void*); - - AlreadyRegistered &operator= (const AlreadyRegistered &); - - virtual void _raise (void); - - virtual void _tao_encode ( - TAO_OutputCDR &, - CORBA::Environment & - ) const; - - virtual void _tao_decode ( - TAO_InputCDR &, - CORBA::Environment & - ); - - static AlreadyRegistered *_downcast (CORBA::Exception *); + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; + + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & + ); + + static AlreadyRegistered *_downcast (CORBA::Exception *); - // = TAO extension. - static CORBA::Exception *_alloc (void); - virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception ImplementationRepository::Administration::AlreadyRegistered. + // = TAO extension. + static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception ImplementationRepository::Administration::AlreadyRegistered. static CORBA::TypeCode_ptr _tc_AlreadyRegistered; - - + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_ + + class TAO_PortableServer_Export CannotActivate : public CORBA::UserException + { + public: + TAO_String_Manager reason; + + CannotActivate (void); + // Default constructor. + + CannotActivate (const CannotActivate &); + // Copy constructor. + + ~CannotActivate (void); + // Destructor. + + static void _tao_any_destructor (void*); + + CannotActivate &operator= (const CannotActivate &); + + virtual void _raise (void); - class TAO_PortableServer_Export CannotActivate : public CORBA::UserException - { - public: - TAO_String_Manager reason; - - CannotActivate (void); - // Default constructor. - - CannotActivate (const CannotActivate &); - // Copy constructor. - - ~CannotActivate (void); - // Destructor. - - static void _tao_any_destructor (void*); - - CannotActivate &operator= (const CannotActivate &); - - virtual void _raise (void); - - virtual void _tao_encode ( - TAO_OutputCDR &, - CORBA::Environment & - ) const; - - virtual void _tao_decode ( - TAO_InputCDR &, - CORBA::Environment & - ); - - static CannotActivate *_downcast (CORBA::Exception *); - - CannotActivate ( - const char * _tao_reason - ); + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; + + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & + ); + + static CannotActivate *_downcast (CORBA::Exception *); - // = TAO extension. - static CORBA::Exception *_alloc (void); - virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception ImplementationRepository::Administration::CannotActivate. + CannotActivate ( + const char * _tao_reason + ); + + // = TAO extension. + static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception ImplementationRepository::Administration::CannotActivate. static CORBA::TypeCode_ptr _tc_CannotActivate; - - + + #endif /* end #if !defined */ - - + + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_) #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_ - - class TAO_PortableServer_Export NotFound : public CORBA::UserException - { - public: - - NotFound (void); - // Default constructor. - - NotFound (const NotFound &); - // Copy constructor. - - ~NotFound (void); - // Destructor. - - static void _tao_any_destructor (void*); - - NotFound &operator= (const NotFound &); - - virtual void _raise (void); - - virtual void _tao_encode ( - TAO_OutputCDR &, - CORBA::Environment & - ) const; - - virtual void _tao_decode ( - TAO_InputCDR &, - CORBA::Environment & - ); - - static NotFound *_downcast (CORBA::Exception *); - - - // = TAO extension. - static CORBA::Exception *_alloc (void); - virtual CORBA::TypeCode_ptr _type (void) const; - }; // Exception ImplementationRepository::Administration::NotFound. - -static CORBA::TypeCode_ptr _tc_NotFound; - - -#endif /* end #if !defined */ - - virtual void activate_server ( - const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )); - - virtual void register_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )); - - virtual void reregister_server ( - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_server ( - const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void shutdown_server ( - const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual char * server_is_running ( - const char * server, - const char * addr, - ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void server_is_shutting_down ( - const char * server, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void find ( - const char * server, - ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void list ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - - private: - _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_; - - protected: - Administration (int collocated = 0); - - // This methods travese the inheritance tree and set the - // parents piece of the given class in the right mode - virtual void ImplementationRepository_Administration_setup_collocation (int collocated); - - Administration ( - TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0 - ); - - friend class _TAO_Administration_Remote_Proxy_Impl; - friend class _TAO_Administration_ThruPOA_Proxy_Impl; - friend class _TAO_Administration_Direct_Proxy_Impl; - - virtual ~Administration (void); - - private: - Administration (const Administration &); - void operator= (const Administration &); - }; - - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulate - // an invocation logics. - - - /////////////////////////////////////////////////////////////////////// - // Base Proxy Impl. Declaration - // - - class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl + + class TAO_PortableServer_Export NotFound : public CORBA::UserException { public: - virtual ~_TAO_Administration_Proxy_Impl (void) { } - virtual void activate_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )) = 0; - - virtual void register_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )) = 0; - - virtual void reregister_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void remove_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; - - virtual void shutdown_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; - - virtual char * server_is_running ( - CORBA_Object *_collocated_tao_target_, - const char * server, - const char * addr, - ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; - - virtual void server_is_shutting_down ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; - - virtual void find ( - CORBA_Object *_collocated_tao_target_, - const char * server, - ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )) = 0; - - virtual void list ( - CORBA_Object *_collocated_tao_target_, - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - - protected: - _TAO_Administration_Proxy_Impl (void); - }; - - // - // End Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Impl. Declaration - // - - class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl - : public virtual _TAO_Administration_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_Administration_Remote_Proxy_Impl (void); - - virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { } - virtual void activate_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound, - ImplementationRepository::Administration::CannotActivate - )); - - virtual void register_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::AlreadyRegistered - )); - - virtual void reregister_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - const ImplementationRepository::StartupOptions & options, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void remove_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void shutdown_server ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual char * server_is_running ( - CORBA_Object *_collocated_tao_target_, - const char * server, - const char * addr, - ImplementationRepository::ServerObject_ptr server_object, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void server_is_shutting_down ( - CORBA_Object *_collocated_tao_target_, - const char * server, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void find ( - CORBA_Object *_collocated_tao_target_, - const char * server, - ImplementationRepository::ServerInformation_out info, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - ImplementationRepository::Administration::NotFound - )); - - virtual void list ( - CORBA_Object *_collocated_tao_target_, - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - ImplementationRepository::ServerInformationIterator_out server_iterator, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - - }; - - // - // End Remote Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - // The Proxy Brokers are used by each interface to get - // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. - - - /////////////////////////////////////////////////////////////////////// - // Base Proxy Broker Declaration - // - - class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker - { - public: - virtual ~_TAO_Administration_Proxy_Broker (void); - virtual _TAO_Administration_Proxy_Impl &select_proxy ( - Administration *object, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ) = 0; - - protected: - _TAO_Administration_Proxy_Broker (void); - - }; - - // - // End Base Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Broker Declaration - // - - class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker - : public virtual _TAO_Administration_Proxy_Broker - { - public: - _TAO_Administration_Remote_Proxy_Broker (void); - - virtual ~_TAO_Administration_Remote_Proxy_Broker (void); + + NotFound (void); + // Default constructor. + + NotFound (const NotFound &); + // Copy constructor. + + ~NotFound (void); + // Destructor. + + static void _tao_any_destructor (void*); + + NotFound &operator= (const NotFound &); + + virtual void _raise (void); - virtual _TAO_Administration_Proxy_Impl &select_proxy ( - Administration *object, - CORBA_Environment &ACE_TRY_ENV + virtual void _tao_encode ( + TAO_OutputCDR &, + CORBA::Environment & + ) const; + + virtual void _tao_decode ( + TAO_InputCDR &, + CORBA::Environment & ); + + static NotFound *_downcast (CORBA::Exception *); - private: - _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_; - - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void); - }; - - // - // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// + // = TAO extension. + static CORBA::Exception *_alloc (void); + virtual CORBA::TypeCode_ptr _type (void) const; + }; // Exception ImplementationRepository::Administration::NotFound. +static CORBA::TypeCode_ptr _tc_NotFound; + + #endif /* end #if !defined */ + + virtual void activate_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )); + + virtual void register_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )); + + virtual void reregister_server ( + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void remove_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void shutdown_server ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual char * server_is_running ( + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void server_is_shutting_down ( + const char * server, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void find ( + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void list ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual CORBA::Boolean _is_a ( + const CORBA::Char *type_id, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration; - - + private: + _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_; + + protected: + Administration (int collocated = 0); + + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_Administration_setup_collocation (int collocated); + + Administration ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_Administration_Remote_Proxy_Impl; + friend class _TAO_Administration_ThruPOA_Proxy_Impl; + friend class _TAO_Administration_Direct_Proxy_Impl; + + virtual ~Administration (void); + + private: + Administration (const Administration &); + void operator= (const Administration &); + }; + + // The Proxy Implementations are used by each interface to + // perform a call. Each different implementation encapsulate + // an invocation logics. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Impl. Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl + : public virtual TAO_Object_Proxy_Impl + { + public: + virtual ~_TAO_Administration_Proxy_Impl (void) { } + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )) = 0; + + virtual void register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )) = 0; + + virtual void reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual char * server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )) = 0; + + virtual void list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + + protected: + _TAO_Administration_Proxy_Impl (void); + }; + + // + // End Base Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Impl. Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl + : public virtual _TAO_Administration_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl + { + public: + _TAO_Administration_Remote_Proxy_Impl (void); + + virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { } + virtual void activate_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound, + ImplementationRepository::Administration::CannotActivate + )); + + virtual void register_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::AlreadyRegistered + )); + + virtual void reregister_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const ImplementationRepository::StartupOptions & options, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void remove_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void shutdown_server ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual char * server_is_running ( + CORBA_Object *_collocated_tao_target_, + const char * server, + const char * addr, + ImplementationRepository::ServerObject_ptr server_object, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void server_is_shutting_down ( + CORBA_Object *_collocated_tao_target_, + const char * server, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void find ( + CORBA_Object *_collocated_tao_target_, + const char * server, + ImplementationRepository::ServerInformation_out info, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + ImplementationRepository::Administration::NotFound + )); + + virtual void list ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + ImplementationRepository::ServerInformationIterator_out server_iterator, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + + }; + + // + // End Remote Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + // The Proxy Brokers are used by each interface to get + // the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on + // a call by call basis. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker + { + public: + virtual ~_TAO_Administration_Proxy_Broker (void); + virtual _TAO_Administration_Proxy_Impl &select_proxy ( + Administration *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ) = 0; + + protected: + _TAO_Administration_Proxy_Broker (void); + + }; + + // + // End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker + : public virtual _TAO_Administration_Proxy_Broker + { + public: + _TAO_Administration_Remote_Proxy_Broker (void); + + virtual ~_TAO_Administration_Remote_Proxy_Broker (void); + + virtual _TAO_Administration_Proxy_Impl &select_proxy ( + Administration *object, + CORBA_Environment &ACE_TRY_ENV + ); + + private: + _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_; + + public: + // This member function is used to get an handle to the unique instance + // of the Remote Proxy Broker that is available for a given + // interface. + static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void); + }; + + // + // End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + +#endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration; + + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_) #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_ + + // Forward Classes Declaration. + class _TAO_ServerInformationIterator_Proxy_Impl; + class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + class _TAO_ServerInformationIterator_Proxy_Broker; + class _TAO_ServerInformationIterator_Remote_Proxy_Broker; + + class TAO_PortableServer_Export ServerInformationIterator + : public virtual CORBA_Object + { + public: + #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef ServerInformationIterator_ptr _ptr_type; + typedef ServerInformationIterator_var _var_type; + #endif /* ! __GNUC__ || g++ >= 2.8 */ - // Forward Classes Declaration - class _TAO_ServerInformationIterator_Proxy_Impl; - class _TAO_ServerInformationIterator_Remote_Proxy_Impl; - class _TAO_ServerInformationIterator_Proxy_Broker; - class _TAO_ServerInformationIterator_Remote_Proxy_Broker; - - class TAO_PortableServer_Export ServerInformationIterator - : public virtual CORBA_Object - { - public: - #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) - typedef ServerInformationIterator_ptr _ptr_type; - typedef ServerInformationIterator_var _var_type; - #endif /* ! __GNUC__ || g++ >= 2.8 */ - - // the static operations - static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); - - static ServerInformationIterator_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - static ServerInformationIterator_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - static ServerInformationIterator_ptr _nil (void) - { - return (ServerInformationIterator_ptr)0; - } - - static void _tao_any_destructor (void*); - - virtual CORBA::Boolean next_n ( - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual CORBA::Boolean _is_a ( - const CORBA::Char *type_id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); - - virtual void *_tao_QueryInterface (ptr_arith_t type); - - virtual const char* _interface_repository_id (void) const; - - private: - _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_; - - protected: - ServerInformationIterator (int collocated = 0); - - // This methods travese the inheritance tree and set the - // parents piece of the given class in the right mode - virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated); - - ServerInformationIterator ( - TAO_Stub *objref, - CORBA::Boolean _tao_collocated = 0, - TAO_Abstract_ServantBase *servant = 0 - ); - - friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; - friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; - friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; - - virtual ~ServerInformationIterator (void); - - private: - ServerInformationIterator (const ServerInformationIterator &); - void operator= (const ServerInformationIterator &); - }; - - // The Proxy Implementations are used by each interface to - // perform a call. Each different implementation encapsulate - // an invocation logics. - - - /////////////////////////////////////////////////////////////////////// - // Base Proxy Impl. Declaration - // - - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl - : public virtual TAO_Object_Proxy_Impl - { - public: - virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { } - virtual CORBA::Boolean next_n ( - CORBA_Object *_collocated_tao_target_, - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - virtual void destroy ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) = 0; - - - protected: - _TAO_ServerInformationIterator_Proxy_Impl (void); - }; - - // - // End Base Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Impl. Declaration - // - - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl - : public virtual _TAO_ServerInformationIterator_Proxy_Impl, - public virtual TAO_Remote_Object_Proxy_Impl - { - public: - _TAO_ServerInformationIterator_Remote_Proxy_Impl (void); - - virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { } - virtual CORBA::Boolean next_n ( - CORBA_Object *_collocated_tao_target_, - CORBA::ULong how_many, - ImplementationRepository::ServerInformationList_out server_list, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void destroy ( - CORBA_Object *_collocated_tao_target_, - CORBA::Environment &ACE_TRY_ENV - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - - }; - - // - // End Remote Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// - - // The Proxy Brokers are used by each interface to get - // the right proxy for performing a call. In the new - // collocation scheme, the proxy to be used can vary on - // a call by call basis. - - - /////////////////////////////////////////////////////////////////////// - // Base Proxy Broker Declaration - // - - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker - { - public: - virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void); - virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( - ServerInformationIterator *object, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () - ) = 0; - - protected: - _TAO_ServerInformationIterator_Proxy_Broker (void); - - }; - - // - // End Base Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - - - /////////////////////////////////////////////////////////////////////// - // Remote Proxy Broker Declaration - // - - class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker - : public virtual _TAO_ServerInformationIterator_Proxy_Broker + static int _tao_class_id; + + // The static operations. + static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj); + + static ServerInformationIterator_ptr _narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static ServerInformationIterator_ptr _unchecked_narrow ( + CORBA::Object_ptr obj, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + static ServerInformationIterator_ptr _nil (void) { - public: - _TAO_ServerInformationIterator_Remote_Proxy_Broker (void); - - virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); - - virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( - ServerInformationIterator *object, - CORBA_Environment &ACE_TRY_ENV - ); - - private: - _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_; - - public: - // This member function is used to get an handle to the unique instance - // of the Remote Proxy Broker that is available for a given - // interface. - static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); - }; - - // - // End Remote Proxy Broker Declaration - /////////////////////////////////////////////////////////////////////// - + return (ServerInformationIterator_ptr)0; + } + + static void _tao_any_destructor (void*); + + virtual CORBA::Boolean next_n ( + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void destroy ( + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual CORBA::Boolean _is_a ( + const CORBA::Char *type_id, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ); + + virtual void *_tao_QueryInterface (ptr_arith_t type); + + virtual const char* _interface_repository_id (void) const; + private: + _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_; + + protected: + ServerInformationIterator (int collocated = 0); + + // This methods travese the inheritance tree and set the + // parents piece of the given class in the right mode + virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated); + + ServerInformationIterator ( + TAO_Stub *objref, + CORBA::Boolean _tao_collocated = 0, + TAO_Abstract_ServantBase *servant = 0 + ); + + friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl; + friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; + friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl; + + virtual ~ServerInformationIterator (void); + + private: + ServerInformationIterator (const ServerInformationIterator &); + void operator= (const ServerInformationIterator &); + }; + + // The Proxy Implementations are used by each interface to + // perform a call. Each different implementation encapsulate + // an invocation logics. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Impl. Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl + : public virtual TAO_Object_Proxy_Impl + { + public: + virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { } + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )) = 0; + + + protected: + _TAO_ServerInformationIterator_Proxy_Impl (void); + }; + + // + // End Base Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Impl. Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl + : public virtual _TAO_ServerInformationIterator_Proxy_Impl, + public virtual TAO_Remote_Object_Proxy_Impl + { + public: + _TAO_ServerInformationIterator_Remote_Proxy_Impl (void); + + virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { } + virtual CORBA::Boolean next_n ( + CORBA_Object *_collocated_tao_target_, + CORBA::ULong how_many, + ImplementationRepository::ServerInformationList_out server_list, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + virtual void destroy ( + CORBA_Object *_collocated_tao_target_, + CORBA::Environment &ACE_TRY_ENV + ) + ACE_THROW_SPEC (( + CORBA::SystemException + )); + + + }; + + // + // End Remote Proxy Impl. Declaration + /////////////////////////////////////////////////////////////////////// + + // The Proxy Brokers are used by each interface to get + // the right proxy for performing a call. In the new + // collocation scheme, the proxy to be used can vary on + // a call by call basis. + + + /////////////////////////////////////////////////////////////////////// + // Base Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker + { + public: + virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void); + virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + ) = 0; + + protected: + _TAO_ServerInformationIterator_Proxy_Broker (void); + + }; + + // + // End Base Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////////// + // Remote Proxy Broker Declaration + // + + class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker + : public virtual _TAO_ServerInformationIterator_Proxy_Broker + { + public: + _TAO_ServerInformationIterator_Remote_Proxy_Broker (void); + + virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); + + virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy ( + ServerInformationIterator *object, + CORBA_Environment &ACE_TRY_ENV + ); + + private: + _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_; + + public: + // This member function is used to get an handle to the unique instance + // of the Remote Proxy Broker that is available for a given + // interface. + static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void); + }; + + // + // End Remote Proxy Broker Declaration + /////////////////////////////////////////////////////////////////////// + + #endif /* end #if !defined */ - - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator; - - - } + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator; + + +} TAO_NAMESPACE_CLOSE // module ImplementationRepository // Proxy Broker Factory function pointer declarations. - extern TAO_PortableServer_Export - ImplementationRepository::_TAO_ServerObject_Proxy_Broker * - (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); - - extern TAO_PortableServer_Export - ImplementationRepository::_TAO_Administration_Proxy_Broker * - (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); - - extern TAO_PortableServer_Export - ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * - (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) ( - CORBA::Object_ptr obj - ); - - // Any operators for interface ImplementationRepository::ServerObject - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated +extern TAO_PortableServer_Export +ImplementationRepository::_TAO_ServerObject_Proxy_Broker * +(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); + +extern TAO_PortableServer_Export +ImplementationRepository::_TAO_Administration_Proxy_Broker * +(*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); + +extern TAO_PortableServer_Export +ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * +(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) ( + CORBA::Object_ptr obj + ); + +// Any operators for interface ImplementationRepository::ServerObject +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&); - // Any operators for interface ImplementationRepository::Administration - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated +// Any operators for interface ImplementationRepository::Administration +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::AlreadyRegistered *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::AlreadyRegistered *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::CannotActivate &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::CannotActivate*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::CannotActivate *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::CannotActivate *&); - TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::Administration::NotFound &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration::NotFound*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration::NotFound *&); // deprecated TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::Administration::NotFound *&); - // Any operators for interface ImplementationRepository::ServerInformationIterator - TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); - TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&); +// Any operators for interface ImplementationRepository::ServerInformationIterator +TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator *&); - #ifndef __ACE_INLINE__ +#ifndef __ACE_INLINE__ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr ); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr ); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &); #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ - #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ +#define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ TAO_PortableServer_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::EnvironmentList & - ); - TAO_PortableServer_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - ImplementationRepository::EnvironmentList & - ); + TAO_OutputCDR &, + const ImplementationRepository::EnvironmentList & + ); +TAO_PortableServer_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + ImplementationRepository::EnvironmentList & + ); #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &); #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ - #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ +#define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ TAO_PortableServer_Export CORBA::Boolean operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::ServerInformationList & - ); - TAO_PortableServer_Export CORBA::Boolean operator>> ( - TAO_InputCDR &, - ImplementationRepository::ServerInformationList & - ); + TAO_OutputCDR &, + const ImplementationRepository::ServerInformationList & + ); +TAO_PortableServer_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + ImplementationRepository::ServerInformationList & + ); #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */ - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr ); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr ); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::AlreadyRegistered &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::AlreadyRegistered &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::CannotActivate &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::CannotActivate &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration::NotFound &); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration::NotFound &); - TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr ); - TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &); +TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr ); +TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &); - #endif /* __ACE_INLINE__ */ +#endif /* __ACE_INLINE__ */ #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp index dfc4ce19f1d..50d726e2af9 100644 --- a/TAO/tao/PortableServer/ImplRepoS.cpp +++ b/TAO/tao/PortableServer/ImplRepoS.cpp @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_CPP_ -#define _TAO_IDL_IMPLREPOS_CPP_ +#ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_ +#define _TAO_IDL_ORIG_IMPLREPOS_CPP_ #include "ImplRepoS.h" @@ -54,9 +54,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 17:40:16 */ +/* starting time is 17:59:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -119,7 +119,8 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch MIN_HASH_VALUE = 4, MAX_HASH_VALUE = 13, HASH_VALUE_RANGE = 10, - DUPLICATES = 0 + DUPLICATES = 0, + WORDLIST_SIZE = 9 }; static const class TAO_operation_db_entry wordlist[] = @@ -149,7 +150,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch } return 0; } -/* ending time is 17:40:16 */ +/* ending time is 17:59:21 */ static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -235,6 +236,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CO return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -348,6 +350,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -940,9 +943,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 17:40:16 */ +/* starting time is 17:59:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1005,7 +1008,8 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const MIN_HASH_VALUE = 4, MAX_HASH_VALUE = 28, HASH_VALUE_RANGE = 25, - DUPLICATES = 0 + DUPLICATES = 0, + WORDLIST_SIZE = 16 }; static const class TAO_operation_db_entry wordlist[] = @@ -1044,7 +1048,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const } return 0; } -/* ending time is 17:40:16 */ +/* ending time is 17:59:21 */ static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -1142,16 +1146,16 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, - {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} + ImplementationRepository::Administration::_tc_NotFound, + ImplementationRepository::Administration::_tc_CannotActivate }; exception_list->length (2); for (CORBA::ULong i = 0; i < 2; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1159,6 +1163,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1291,15 +1296,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} + ImplementationRepository::Administration::_tc_AlreadyRegistered }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1307,6 +1312,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1440,6 +1446,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server: return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1565,15 +1572,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1581,6 +1588,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1706,15 +1714,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1722,6 +1730,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -1862,15 +1871,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -1878,6 +1887,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running: return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -2014,15 +2024,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2030,6 +2040,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -2155,15 +2166,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions ( Dynamic::ExceptionList_var safe_exception_list = exception_list; - static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = + static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} + ImplementationRepository::Administration::_tc_NotFound }; exception_list->length (1); for (CORBA::ULong i = 0; i < 1; ++i) { - CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc; + CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i]; TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1); (*exception_list)[i] = tcp_object; } @@ -2171,6 +2182,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions ( return safe_exception_list._retn (); } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -2302,6 +2314,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions ( return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -3956,9 +3969,9 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 17:40:17 */ +/* starting time is 17:59:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /export/project/valinor/ossama/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ +/* Command-line: /project/sirion/coryan/head/ACE_wrappers/build/Linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -4021,7 +4034,8 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo MIN_HASH_VALUE = 5, MAX_HASH_VALUE = 13, HASH_VALUE_RANGE = 9, - DUPLICATES = 0 + DUPLICATES = 0, + WORDLIST_SIZE = 10 }; static const class TAO_operation_db_entry wordlist[] = @@ -4050,7 +4064,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo } return 0; } -/* ending time is 17:40:17 */ +/* ending time is 17:59:21 */ static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable; #if (TAO_HAS_INTERCEPTORS == 1) @@ -4150,6 +4164,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n: return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -4274,6 +4289,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy return exception_list; } + CORBA::Any * TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -4322,14 +4338,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) this->proxy_cache_[i] = 0; - + } POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) { for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) delete this->proxy_cache_[i]; - + } ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& @@ -4340,25 +4356,25 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B { int strategy = TAO_ORB_Core::collocation_strategy (object); - + if (this->proxy_cache_[strategy] != 0) return *this->proxy_cache_[strategy]; - + this->create_proxy (strategy, ACE_TRY_ENV); ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); - + return *this->proxy_cache_[strategy]; - + } -void +void POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( int strategy, CORBA::Environment &ACE_TRY_ENV ) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); - + if (this->proxy_cache_[strategy] == 0) { switch (strategy) @@ -4441,7 +4457,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru CORBA::SystemException )) { - CORBA::Boolean _tao_retval = 0; + CORBA::Boolean _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); TAO_Object_Adapter::Servant_Upcall servant_upcall ( _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core () @@ -4526,7 +4542,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire server_list, ACE_TRY_ENV ); - + } void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( @@ -4577,7 +4593,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( POA_ImplementationRepository::ServerInformationIterator *_tao_impl = ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator *, _tao_object_reference); - CORBA::Boolean _tao_retval = 0; + CORBA::Boolean _tao_retval = 0; CORBA::ULong how_many; ImplementationRepository::ServerInformationList_var server_list; if (!( @@ -4644,11 +4660,11 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( ACE_ENDTRY; ACE_CHECK; #endif /* TAO_HAS_INTERCEPTORS */ - + _tao_server_request.init_reply (); - + TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - + if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) && (_tao_out << server_list.in ()) @@ -4701,7 +4717,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( ACE_TRY_ENV ); TAO_INTERCEPTOR_CHECK; - + #if (TAO_HAS_INTERCEPTORS == 1) ri.reply_status (PortableInterceptor::SUCCESSFUL); _tao_vfr.send_reply (&ri, ACE_TRY_ENV); @@ -4761,7 +4777,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( } void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV @@ -4778,7 +4794,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel } void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( - TAO_ServerRequest &_tao_server_request, + TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* Servant_Upcall */, CORBA::Environment &ACE_TRY_ENV diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h index ef3099316fe..a1ea062001a 100644 --- a/TAO/tao/PortableServer/ImplRepoS.h +++ b/TAO/tao/PortableServer/ImplRepoS.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_H_ -#define _TAO_IDL_IMPLREPOS_H_ +#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_ +#define _TAO_IDL_ORIG_IMPLREPOS_H_ #include "ace/pre.h" #include "ImplRepoC.h" @@ -55,7 +55,8 @@ TAO_NAMESPACE POA_ImplementationRepository class _TAO_ServerObject_Direct_Proxy_Impl; class _TAO_ServerObject_Strategized_Proxy_Broker; - class TAO_PortableServer_Export ServerObject : public virtual PortableServer::ServantBase + class TAO_PortableServer_Export ServerObject + : public virtual PortableServer::ServantBase { protected: ServerObject (void); @@ -269,7 +270,8 @@ class _TAO_Administration_ThruPOA_Proxy_Impl; class _TAO_Administration_Direct_Proxy_Impl; class _TAO_Administration_Strategized_Proxy_Broker; -class TAO_PortableServer_Export Administration : public virtual PortableServer::ServantBase +class TAO_PortableServer_Export Administration + : public virtual PortableServer::ServantBase { protected: Administration (void); @@ -772,7 +774,8 @@ class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl; class _TAO_ServerInformationIterator_Direct_Proxy_Impl; class _TAO_ServerInformationIterator_Strategized_Proxy_Broker; -class TAO_PortableServer_Export ServerInformationIterator : public virtual PortableServer::ServantBase +class TAO_PortableServer_Export ServerInformationIterator + : public virtual PortableServer::ServantBase { protected: ServerInformationIterator (void); diff --git a/TAO/tao/PortableServer/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp index 016d28b09a2..33c9ff71548 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.cpp +++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_T_CPP_ -#define _TAO_IDL_IMPLREPOS_T_CPP_ +#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_CPP_ +#define _TAO_IDL_ORIG_IMPLREPOS_T_CPP_ #include "ImplRepoS_T.h" diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h index 5ef43a79a77..5e3d34d5d19 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.h +++ b/TAO/tao/PortableServer/ImplRepoS_T.h @@ -19,8 +19,8 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#ifndef _TAO_IDL_IMPLREPOS_T_H_ -#define _TAO_IDL_IMPLREPOS_T_H_ +#ifndef _TAO_IDL_ORIG_IMPLREPOS_T_H_ +#define _TAO_IDL_ORIG_IMPLREPOS_T_H_ #include "ace/pre.h" #if defined(_MSC_VER) @@ -31,7 +31,6 @@ #endif /* _MSC_VER */ #if defined (ACE_HAS_USING_KEYWORD) - TAO_NAMESPACE POA_ImplementationRepository { // TIE class: Refer to CORBA v2.2, Section 20.34.4 @@ -295,7 +294,6 @@ TAO_NAMESPACE POA_ImplementationRepository } TAO_NAMESPACE_CLOSE // module ImplementationRepository - #endif /* ACE_HAS_USING_KEYWORD */ #if defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i index 5ca98d451c6..b8b1152bdbd 100644 --- a/TAO/tao/PortableServer/ImplRepoS_T.i +++ b/TAO/tao/PortableServer/ImplRepoS_T.i @@ -124,6 +124,10 @@ ACE_TRY_ENV ); } +#endif /* ACE_HAS_USING_KEYWORD */ + +#if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t) : ptr_ (&t), @@ -358,6 +362,10 @@ how_many, ); } +#endif /* ACE_HAS_USING_KEYWORD */ + +#if defined (ACE_HAS_USING_KEYWORD) + template <class T> ACE_INLINE POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t) : ptr_ (&t), @@ -466,3 +474,4 @@ ACE_TRY_ENV } #endif /* ACE_HAS_USING_KEYWORD */ + diff --git a/TAO/tao/PortableServer/diffs/ImplRepo.diff b/TAO/tao/PortableServer/diffs/ImplRepo.diff new file mode 100644 index 00000000000..057e16cf4a0 --- /dev/null +++ b/TAO/tao/PortableServer/diffs/ImplRepo.diff @@ -0,0 +1,417 @@ +--- orig/ImplRepoC.h Wed Aug 1 17:59:21 2001 ++++ ImplRepoC.h Wed Aug 1 18:03:55 2001 +@@ -23,12 +23,19 @@ + #define _TAO_IDL_ORIG_IMPLREPOC_H_ + + #include "ace/pre.h" +-#include "tao/corba.h" ++#include "tao/corbafwd.h" + + #if !defined (ACE_LACKS_PRAGMA_ONCE) + # pragma once + #endif /* ACE_LACKS_PRAGMA_ONCE */ + ++#include "tao/CDR.h" ++#include "tao/Any.h" ++#include "tao/Object.h" ++#include "tao/ClientRequestInfo.h" ++#include "tao/Remote_Object_Proxy_Impl.h" ++#include "tao/Managed_Types.h" ++#include "tao/Sequence.h" + #include "portableserver_export.h" + + #if defined (TAO_EXPORT_MACRO) +--- orig/ImplRepoC.i Wed Aug 1 17:59:21 2001 ++++ ImplRepoC.i Wed Aug 1 18:03:55 2001 +@@ -23,6 +23,49 @@ + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_) + #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_ + ++ACE_INLINE ImplementationRepository::ServerObject_ptr ++tao_ImplementationRepository_ServerObject_duplicate ( ++ ImplementationRepository::ServerObject_ptr p ++ ) ++{ ++ return ImplementationRepository::ServerObject::_duplicate (p); ++} ++ ++ACE_INLINE void ++tao_ImplementationRepository_ServerObject_release ( ++ ImplementationRepository::ServerObject_ptr p ++ ) ++{ ++ CORBA::release (p); ++} ++ ++ACE_INLINE ImplementationRepository::ServerObject_ptr ++tao_ImplementationRepository_ServerObject_nil ( ++ void ++ ) ++{ ++ return ImplementationRepository::ServerObject::_nil (); ++} ++ ++ACE_INLINE ImplementationRepository::ServerObject_ptr ++tao_ImplementationRepository_ServerObject_narrow ( ++ CORBA::Object *p, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++{ ++ return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV); ++} ++ ++ACE_INLINE CORBA::Object * ++tao_ImplementationRepository_ServerObject_upcast ( ++ void *src ++ ) ++{ ++ ImplementationRepository::ServerObject **tmp = ++ ACE_static_cast (ImplementationRepository::ServerObject **, src); ++ return *tmp; ++} ++ + ACE_INLINE + ImplementationRepository::ServerObject::ServerObject ( + TAO_Stub *objref, +@@ -1420,6 +1463,49 @@ + #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_) + #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_ + ++ACE_INLINE ImplementationRepository::Administration_ptr ++tao_ImplementationRepository_Administration_duplicate ( ++ ImplementationRepository::Administration_ptr p ++ ) ++{ ++ return ImplementationRepository::Administration::_duplicate (p); ++} ++ ++ACE_INLINE void ++tao_ImplementationRepository_Administration_release ( ++ ImplementationRepository::Administration_ptr p ++ ) ++{ ++ CORBA::release (p); ++} ++ ++ACE_INLINE ImplementationRepository::Administration_ptr ++tao_ImplementationRepository_Administration_nil ( ++ void ++ ) ++{ ++ return ImplementationRepository::Administration::_nil (); ++} ++ ++ACE_INLINE ImplementationRepository::Administration_ptr ++tao_ImplementationRepository_Administration_narrow ( ++ CORBA::Object *p, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++{ ++ return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV); ++} ++ ++ACE_INLINE CORBA::Object * ++tao_ImplementationRepository_Administration_upcast ( ++ void *src ++ ) ++{ ++ ImplementationRepository::Administration **tmp = ++ ACE_static_cast (ImplementationRepository::Administration **, src); ++ return *tmp; ++} ++ + ACE_INLINE + ImplementationRepository::Administration::Administration ( + TAO_Stub *objref, +@@ -1438,6 +1524,49 @@ + #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_) + #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_ + ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++tao_ImplementationRepository_ServerInformationIterator_duplicate ( ++ ImplementationRepository::ServerInformationIterator_ptr p ++ ) ++{ ++ return ImplementationRepository::ServerInformationIterator::_duplicate (p); ++} ++ ++ACE_INLINE void ++tao_ImplementationRepository_ServerInformationIterator_release ( ++ ImplementationRepository::ServerInformationIterator_ptr p ++ ) ++{ ++ CORBA::release (p); ++} ++ ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++tao_ImplementationRepository_ServerInformationIterator_nil ( ++ void ++ ) ++{ ++ return ImplementationRepository::ServerInformationIterator::_nil (); ++} ++ ++ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr ++tao_ImplementationRepository_ServerInformationIterator_narrow ( ++ CORBA::Object *p, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++{ ++ return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV); ++} ++ ++ACE_INLINE CORBA::Object * ++tao_ImplementationRepository_ServerInformationIterator_upcast ( ++ void *src ++ ) ++{ ++ ImplementationRepository::ServerInformationIterator **tmp = ++ ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); ++ return *tmp; ++} ++ + ACE_INLINE + ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( + TAO_Stub *objref, +@@ -1452,12 +1581,12 @@ + + #endif /* end #if !defined */ + +-TAO_PortableServer_Export CORBA::Boolean operator<< ( ++CORBA::Boolean TAO_PortableServer_Export operator<< ( + TAO_OutputCDR &, + const ImplementationRepository::ServerObject_ptr + ); + +-TAO_PortableServer_Export CORBA::Boolean operator>> ( ++CORBA::Boolean TAO_PortableServer_Export operator>> ( + TAO_InputCDR &, + ImplementationRepository::ServerObject_ptr & + ); +@@ -1591,22 +1720,22 @@ + + #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */ + +-TAO_PortableServer_Export CORBA::Boolean operator<< ( ++CORBA::Boolean TAO_PortableServer_Export operator<< ( + TAO_OutputCDR &, + const ImplementationRepository::ServerInformationIterator_ptr + ); + +-TAO_PortableServer_Export CORBA::Boolean operator>> ( ++CORBA::Boolean TAO_PortableServer_Export operator>> ( + TAO_InputCDR &, + ImplementationRepository::ServerInformationIterator_ptr & + ); + +-TAO_PortableServer_Export CORBA::Boolean operator<< ( ++CORBA::Boolean TAO_PortableServer_Export operator<< ( + TAO_OutputCDR &, + const ImplementationRepository::Administration_ptr + ); + +-TAO_PortableServer_Export CORBA::Boolean operator>> ( ++CORBA::Boolean TAO_PortableServer_Export operator>> ( + TAO_InputCDR &, + ImplementationRepository::Administration_ptr & + ); +--- orig/ImplRepoC.cpp Wed Aug 1 17:59:21 2001 ++++ ImplRepoC.cpp Wed Aug 1 18:03:55 2001 +@@ -41,49 +41,6 @@ + + int ImplementationRepository::ServerObject::_tao_class_id = 0; + +-ImplementationRepository::ServerObject_ptr +-tao_ImplementationRepository_ServerObject_duplicate ( +- ImplementationRepository::ServerObject_ptr p +- ) +-{ +- return ImplementationRepository::ServerObject::_duplicate (p); +-} +- +-void +-tao_ImplementationRepository_ServerObject_release ( +- ImplementationRepository::ServerObject_ptr p +- ) +-{ +- CORBA::release (p); +-} +- +-ImplementationRepository::ServerObject_ptr +-tao_ImplementationRepository_ServerObject_nil ( +- void +- ) +-{ +- return ImplementationRepository::ServerObject::_nil (); +-} +- +-ImplementationRepository::ServerObject_ptr +-tao_ImplementationRepository_ServerObject_narrow ( +- CORBA::Object *p, +- CORBA::Environment &ACE_TRY_ENV +- ) +-{ +- return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV); +-} +- +-CORBA::Object * +-tao_ImplementationRepository_ServerObject_upcast ( +- void *src +- ) +-{ +- ImplementationRepository::ServerObject **tmp = +- ACE_static_cast (ImplementationRepository::ServerObject **, src); +- return *tmp; +-} +- + // ************************************************************* + // Operations for class ImplementationRepository::ServerObject_var + // ************************************************************* +@@ -206,7 +163,6 @@ + ACE_static_cast (ServerObject **, src); + return *tmp; + } +- + // ************************************************************* + // Operations for class ImplementationRepository::ServerObject_out + // ************************************************************* +@@ -2087,49 +2043,6 @@ + + int ImplementationRepository::Administration::_tao_class_id = 0; + +-ImplementationRepository::Administration_ptr +-tao_ImplementationRepository_Administration_duplicate ( +- ImplementationRepository::Administration_ptr p +- ) +-{ +- return ImplementationRepository::Administration::_duplicate (p); +-} +- +-void +-tao_ImplementationRepository_Administration_release ( +- ImplementationRepository::Administration_ptr p +- ) +-{ +- CORBA::release (p); +-} +- +-ImplementationRepository::Administration_ptr +-tao_ImplementationRepository_Administration_nil ( +- void +- ) +-{ +- return ImplementationRepository::Administration::_nil (); +-} +- +-ImplementationRepository::Administration_ptr +-tao_ImplementationRepository_Administration_narrow ( +- CORBA::Object *p, +- CORBA::Environment &ACE_TRY_ENV +- ) +-{ +- return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV); +-} +- +-CORBA::Object * +-tao_ImplementationRepository_Administration_upcast ( +- void *src +- ) +-{ +- ImplementationRepository::Administration **tmp = +- ACE_static_cast (ImplementationRepository::Administration **, src); +- return *tmp; +-} +- + // ************************************************************* + // Operations for class ImplementationRepository::Administration_var + // ************************************************************* +@@ -2252,7 +2165,6 @@ + ACE_static_cast (Administration **, src); + return *tmp; + } +- + // ************************************************************* + // Operations for class ImplementationRepository::Administration_out + // ************************************************************* +@@ -5749,49 +5661,6 @@ + + int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0; + +-ImplementationRepository::ServerInformationIterator_ptr +-tao_ImplementationRepository_ServerInformationIterator_duplicate ( +- ImplementationRepository::ServerInformationIterator_ptr p +- ) +-{ +- return ImplementationRepository::ServerInformationIterator::_duplicate (p); +-} +- +-void +-tao_ImplementationRepository_ServerInformationIterator_release ( +- ImplementationRepository::ServerInformationIterator_ptr p +- ) +-{ +- CORBA::release (p); +-} +- +-ImplementationRepository::ServerInformationIterator_ptr +-tao_ImplementationRepository_ServerInformationIterator_nil ( +- void +- ) +-{ +- return ImplementationRepository::ServerInformationIterator::_nil (); +-} +- +-ImplementationRepository::ServerInformationIterator_ptr +-tao_ImplementationRepository_ServerInformationIterator_narrow ( +- CORBA::Object *p, +- CORBA::Environment &ACE_TRY_ENV +- ) +-{ +- return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV); +-} +- +-CORBA::Object * +-tao_ImplementationRepository_ServerInformationIterator_upcast ( +- void *src +- ) +-{ +- ImplementationRepository::ServerInformationIterator **tmp = +- ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); +- return *tmp; +-} +- + // ************************************************************* + // Operations for class ImplementationRepository::ServerInformationIterator_var + // ************************************************************* +@@ -5914,7 +5783,6 @@ + ACE_static_cast (ServerInformationIterator **, src); + return *tmp; + } +- + // ************************************************************* + // Operations for class ImplementationRepository::ServerInformationIterator_out + // ************************************************************* +@@ -7784,11 +7652,6 @@ + // If length is 0 we return true. + if (0 >= _tao_seq_len) + return 1; +- // Add a check to the length of the sequence +- // to make sure it does not exceed the length +- // of the stream. (See bug 58.) +- if (_tao_seq_len > strm.length()) +- return 0; + // retrieve all the elements + CORBA::Boolean _tao_marshal_flag = 1; + for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) +@@ -7831,11 +7694,6 @@ + // If length is 0 we return true. + if (0 >= _tao_seq_len) + return 1; +- // Add a check to the length of the sequence +- // to make sure it does not exceed the length +- // of the stream. (See bug 58.) +- if (_tao_seq_len > strm.length()) +- return 0; + // retrieve all the elements + CORBA::Boolean _tao_marshal_flag = 1; + for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) diff --git a/TAO/tao/diffs/ImplRepoC.cpp.diff b/TAO/tao/diffs/ImplRepoC.cpp.diff deleted file mode 100644 index 8574f0d7b1d..00000000000 --- a/TAO/tao/diffs/ImplRepoC.cpp.diff +++ /dev/null @@ -1,217 +0,0 @@ ---- PortableServer/orig/ImplRepoC.cpp Wed Apr 25 00:19:07 2001 -+++ PortableServer/ImplRepoC.cpp Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,7 +23,7 @@ - - #include "tao/Stub.h" - #include "tao/Invocation.h" --#include "tao/ClientRequestInfo.h" -+#include "tao/PortableInterceptor.h" - #if TAO_HAS_INTERCEPTORS == 1 - #include "tao/RequestInfo_Util.h" - #endif /* TAO_HAS_INTERCEPTORS == 1 */ -@@ -36,49 +36,6 @@ - #include "ImplRepoC.i" - #endif /* !defined INLINE */ - --ImplementationRepository::ServerObject_ptr --tao_ImplementationRepository_ServerObject_duplicate ( -- ImplementationRepository::ServerObject_ptr p -- ) --{ -- return ImplementationRepository::ServerObject::_duplicate (p); --} -- --void --tao_ImplementationRepository_ServerObject_release ( -- ImplementationRepository::ServerObject_ptr p -- ) --{ -- CORBA::release (p); --} -- --ImplementationRepository::ServerObject_ptr --tao_ImplementationRepository_ServerObject_nil ( -- void -- ) --{ -- return ImplementationRepository::ServerObject::_nil (); --} -- --ImplementationRepository::ServerObject_ptr --tao_ImplementationRepository_ServerObject_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_ImplementationRepository_ServerObject_upcast ( -- void *src -- ) --{ -- ImplementationRepository::ServerObject **tmp = -- ACE_static_cast (ImplementationRepository::ServerObject **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class ImplementationRepository::ServerObject_var - // ************************************************************* -@@ -201,7 +158,6 @@ - ACE_static_cast (ServerObject **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class ImplementationRepository::ServerObject_out - // ************************************************************* -@@ -2044,49 +2000,6 @@ - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList) - TAO_NAMESPACE_END - --ImplementationRepository::Administration_ptr --tao_ImplementationRepository_Administration_duplicate ( -- ImplementationRepository::Administration_ptr p -- ) --{ -- return ImplementationRepository::Administration::_duplicate (p); --} -- --void --tao_ImplementationRepository_Administration_release ( -- ImplementationRepository::Administration_ptr p -- ) --{ -- CORBA::release (p); --} -- --ImplementationRepository::Administration_ptr --tao_ImplementationRepository_Administration_nil ( -- void -- ) --{ -- return ImplementationRepository::Administration::_nil (); --} -- --ImplementationRepository::Administration_ptr --tao_ImplementationRepository_Administration_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_ImplementationRepository_Administration_upcast ( -- void *src -- ) --{ -- ImplementationRepository::Administration **tmp = -- ACE_static_cast (ImplementationRepository::Administration **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class ImplementationRepository::Administration_var - // ************************************************************* -@@ -2209,7 +2122,6 @@ - ACE_static_cast (Administration **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class ImplementationRepository::Administration_out - // ************************************************************* -@@ -5564,49 +5476,6 @@ - TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration) - TAO_NAMESPACE_END - --ImplementationRepository::ServerInformationIterator_ptr --tao_ImplementationRepository_ServerInformationIterator_duplicate ( -- ImplementationRepository::ServerInformationIterator_ptr p -- ) --{ -- return ImplementationRepository::ServerInformationIterator::_duplicate (p); --} -- --void --tao_ImplementationRepository_ServerInformationIterator_release ( -- ImplementationRepository::ServerInformationIterator_ptr p -- ) --{ -- CORBA::release (p); --} -- --ImplementationRepository::ServerInformationIterator_ptr --tao_ImplementationRepository_ServerInformationIterator_nil ( -- void -- ) --{ -- return ImplementationRepository::ServerInformationIterator::_nil (); --} -- --ImplementationRepository::ServerInformationIterator_ptr --tao_ImplementationRepository_ServerInformationIterator_narrow ( -- CORBA::Object *p, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV); --} -- --CORBA::Object * --tao_ImplementationRepository_ServerInformationIterator_upcast ( -- void *src -- ) --{ -- ImplementationRepository::ServerInformationIterator **tmp = -- ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); -- return *tmp; --} -- - // ************************************************************* - // Operations for class ImplementationRepository::ServerInformationIterator_var - // ************************************************************* -@@ -5729,7 +5598,6 @@ - ACE_static_cast (ServerInformationIterator **, src); - return *tmp; - } -- - // ************************************************************* - // Inline operations for class ImplementationRepository::ServerInformationIterator_out - // ************************************************************* -@@ -7560,11 +7428,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -@@ -7607,11 +7470,6 @@ - // If length is 0 we return true. - if (0 >= _tao_seq_len) - return 1; -- // Add a check to the length of the sequence -- // to make sure it does not exceed the length -- // of the stream. (See bug 58.) -- if (_tao_seq_len > strm.length()) -- return 0; - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) diff --git a/TAO/tao/diffs/ImplRepoC.h.diff b/TAO/tao/diffs/ImplRepoC.h.diff deleted file mode 100644 index 71eab8a7ad5..00000000000 --- a/TAO/tao/diffs/ImplRepoC.h.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- PortableServer/orig/ImplRepoC.h Wed Apr 25 00:19:07 2001 -+++ PortableServer/ImplRepoC.h Tue Apr 24 13:44:52 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,12 +23,19 @@ - #define _TAO_IDL_ORIG_IMPLREPOC_H_ - - #include "ace/pre.h" --#include "tao/corba.h" -+#include "tao/corbafwd.h" - - #if !defined (ACE_LACKS_PRAGMA_ONCE) - # pragma once - #endif /* ACE_LACKS_PRAGMA_ONCE */ - -+#include "tao/CDR.h" -+#include "tao/Any.h" -+#include "tao/Object.h" -+#include "tao/ClientRequestInfo.h" -+#include "tao/Remote_Object_Proxy_Impl.h" -+#include "tao/Managed_Types.h" -+#include "tao/Sequence.h" - #include "portableserver_export.h" - - #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/diffs/ImplRepoC.i.diff b/TAO/tao/diffs/ImplRepoC.i.diff deleted file mode 100644 index 0eac1fd7731..00000000000 --- a/TAO/tao/diffs/ImplRepoC.i.diff +++ /dev/null @@ -1,202 +0,0 @@ ---- PortableServer/orig/ImplRepoC.i Wed Apr 25 00:19:07 2001 -+++ PortableServer/ImplRepoC.i Tue Apr 24 13:44:53 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -23,6 +23,49 @@ - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_) - #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_ - -+ACE_INLINE ImplementationRepository::ServerObject_ptr -+tao_ImplementationRepository_ServerObject_duplicate ( -+ ImplementationRepository::ServerObject_ptr p -+ ) -+{ -+ return ImplementationRepository::ServerObject::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_ImplementationRepository_ServerObject_release ( -+ ImplementationRepository::ServerObject_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE ImplementationRepository::ServerObject_ptr -+tao_ImplementationRepository_ServerObject_nil ( -+ void -+ ) -+{ -+ return ImplementationRepository::ServerObject::_nil (); -+} -+ -+ACE_INLINE ImplementationRepository::ServerObject_ptr -+tao_ImplementationRepository_ServerObject_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_ImplementationRepository_ServerObject_upcast ( -+ void *src -+ ) -+{ -+ ImplementationRepository::ServerObject **tmp = -+ ACE_static_cast (ImplementationRepository::ServerObject **, src); -+ return *tmp; -+} -+ - ACE_INLINE - ImplementationRepository::ServerObject::ServerObject ( - TAO_Stub *objref, -@@ -1420,6 +1463,49 @@ - #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_) - #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_ - -+ACE_INLINE ImplementationRepository::Administration_ptr -+tao_ImplementationRepository_Administration_duplicate ( -+ ImplementationRepository::Administration_ptr p -+ ) -+{ -+ return ImplementationRepository::Administration::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_ImplementationRepository_Administration_release ( -+ ImplementationRepository::Administration_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE ImplementationRepository::Administration_ptr -+tao_ImplementationRepository_Administration_nil ( -+ void -+ ) -+{ -+ return ImplementationRepository::Administration::_nil (); -+} -+ -+ACE_INLINE ImplementationRepository::Administration_ptr -+tao_ImplementationRepository_Administration_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_ImplementationRepository_Administration_upcast ( -+ void *src -+ ) -+{ -+ ImplementationRepository::Administration **tmp = -+ ACE_static_cast (ImplementationRepository::Administration **, src); -+ return *tmp; -+} -+ - ACE_INLINE - ImplementationRepository::Administration::Administration ( - TAO_Stub *objref, -@@ -1438,6 +1524,49 @@ - #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_) - #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_ - -+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -+tao_ImplementationRepository_ServerInformationIterator_duplicate ( -+ ImplementationRepository::ServerInformationIterator_ptr p -+ ) -+{ -+ return ImplementationRepository::ServerInformationIterator::_duplicate (p); -+} -+ -+ACE_INLINE void -+tao_ImplementationRepository_ServerInformationIterator_release ( -+ ImplementationRepository::ServerInformationIterator_ptr p -+ ) -+{ -+ CORBA::release (p); -+} -+ -+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -+tao_ImplementationRepository_ServerInformationIterator_nil ( -+ void -+ ) -+{ -+ return ImplementationRepository::ServerInformationIterator::_nil (); -+} -+ -+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr -+tao_ImplementationRepository_ServerInformationIterator_narrow ( -+ CORBA::Object *p, -+ CORBA::Environment &ACE_TRY_ENV -+ ) -+{ -+ return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV); -+} -+ -+ACE_INLINE CORBA::Object * -+tao_ImplementationRepository_ServerInformationIterator_upcast ( -+ void *src -+ ) -+{ -+ ImplementationRepository::ServerInformationIterator **tmp = -+ ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src); -+ return *tmp; -+} -+ - ACE_INLINE - ImplementationRepository::ServerInformationIterator::ServerInformationIterator ( - TAO_Stub *objref, -@@ -1452,12 +1581,12 @@ - - #endif /* end #if !defined */ - --TAO_PortableServer_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_PortableServer_Export operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::ServerObject_ptr - ); - --TAO_PortableServer_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_PortableServer_Export operator>> ( - TAO_InputCDR &, - ImplementationRepository::ServerObject_ptr & - ); -@@ -1591,22 +1720,22 @@ - - #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */ - --TAO_PortableServer_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_PortableServer_Export operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::ServerInformationIterator_ptr - ); - --TAO_PortableServer_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_PortableServer_Export operator>> ( - TAO_InputCDR &, - ImplementationRepository::ServerInformationIterator_ptr & - ); - --TAO_PortableServer_Export CORBA::Boolean operator<< ( -+CORBA::Boolean TAO_PortableServer_Export operator<< ( - TAO_OutputCDR &, - const ImplementationRepository::Administration_ptr - ); - --TAO_PortableServer_Export CORBA::Boolean operator>> ( -+CORBA::Boolean TAO_PortableServer_Export operator>> ( - TAO_InputCDR &, - ImplementationRepository::Administration_ptr & - ); diff --git a/TAO/tao/diffs/ImplRepoS.cpp.diff b/TAO/tao/diffs/ImplRepoS.cpp.diff deleted file mode 100644 index 60508b8aa6c..00000000000 --- a/TAO/tao/diffs/ImplRepoS.cpp.diff +++ /dev/null @@ -1,2457 +0,0 @@ ---- orig/ImplRepoS.cpp Sun Apr 1 16:33:09 2001 -+++ ImplRepoS.cpp Sun Apr 1 17:53:26 2001 -@@ -29,6 +29,7 @@ - #include "tao/ORB_Core.h" - #include "tao/Stub.h" - #include "tao/IFR_Client_Adapter.h" -+#include "tao/PortableInterceptor.h" - #include "ace/Dynamic_Service.h" - - #if TAO_HAS_INTERCEPTORS == 1 -@@ -121,10 +122,10 @@ - static const class TAO_operation_db_entry wordlist[] = - { - {"",0},{"",0},{"",0},{"",0}, -- {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, -+ {"ping", &POA_ImplementationRepository::ServerObject::ping_skel}, - {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel}, - {"",0},{"",0}, -- {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, -+ {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel}, - {"",0}, - {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel}, - {"",0},{"",0}, -@@ -164,14 +165,14 @@ - { - for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) - this->proxy_cache_[i] = 0; -- -+ - } - - POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void) - { - for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) - delete this->proxy_cache_[i]; -- -+ - } - - ImplementationRepository::_TAO_ServerObject_Proxy_Impl& -@@ -182,25 +183,25 @@ - { - int strategy = - TAO_ORB_Core::collocation_strategy (object); -- -+ - if (this->proxy_cache_[strategy] != 0) - return *this->proxy_cache_[strategy]; -- -+ - this->create_proxy (strategy, ACE_TRY_ENV); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); -- -+ - return *this->proxy_cache_[strategy]; -- -+ - } - --void -+void - POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy ( - int strategy, - CORBA::Environment &ACE_TRY_ENV - ) - { - ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); -- -+ - if (this->proxy_cache_[strategy] == 0) - { - switch (strategy) -@@ -213,7 +214,7 @@ - ); - ACE_CHECK; - break; -- -+ - case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: - ACE_NEW_THROW_EX ( - this->proxy_cache_[strategy], -@@ -222,7 +223,7 @@ - ); - ACE_CHECK; - break; -- -+ - case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: - default: - ACE_NEW_THROW_EX ( -@@ -232,9 +233,9 @@ - ); - ACE_CHECK; - break; -- -+ - } -- -+ - } - } - -@@ -255,14 +256,14 @@ - ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (long _dummy_) - { - ACE_UNUSED_ARG (_dummy_); -- -- ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = -+ -+ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = - ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function; -- -+ - return 0; - } - --static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = -+static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer)); - - -@@ -361,7 +362,7 @@ - )->ping ( - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown ( -@@ -378,7 +379,7 @@ - )->shutdown ( - ACE_TRY_ENV - ); -- -+ - } - - -@@ -403,39 +404,39 @@ - - void POA_ImplementationRepository::ServerObject::ping_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter _tao_vfr ( - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ri ( - _tao_server_request, - _tao_impl, - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->ping ( - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -443,7 +444,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -464,48 +465,48 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::ServerObject::shutdown_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter _tao_vfr ( - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ri ( - _tao_server_request, - _tao_impl, - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->shutdown ( - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -513,7 +514,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -534,15 +535,15 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::ServerObject::_is_a_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -554,10 +555,10 @@ - CORBA::String_var value; - if (!(_tao_in >> value.out ())) - ACE_THROW (CORBA::MARSHAL ()); -- -+ - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; -- -+ - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -@@ -565,7 +566,7 @@ - } - - void POA_ImplementationRepository::ServerObject::_non_existent_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -574,7 +575,7 @@ - POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; -- -+ - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -@@ -582,7 +583,7 @@ - } - - void POA_ImplementationRepository::ServerObject::_interface_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -591,26 +592,26 @@ - POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference; - CORBA_InterfaceDef_ptr _tao_retval = 0; - CORBA::Boolean _tao_result = 0; -- -+ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); -- -+ - if (_tao_adapter == 0) - { - ACE_THROW (CORBA::INTF_REPOS ()); - } -- -+ - ACE_TRY - { - _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - _tao_result = - _tao_adapter->interfacedef_cdr_insert ( - _tao_out, -@@ -622,7 +623,7 @@ - _tao_adapter->dispose (_tao_retval); - } - ACE_ENDTRY; -- -+ - if (_tao_result == 0) - { - ACE_THROW (CORBA::MARSHAL ()); -@@ -636,7 +637,7 @@ - { - const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) || - (!ACE_OS::strcmp ((char *)value, base_id))) -@@ -671,14 +672,14 @@ - { - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - CORBA::Object_ptr tmp = CORBA::Object::_nil (); -- -+ - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); - else - ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); -- -+ - CORBA::Object_var obj = tmp; - return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ()); - } -@@ -702,7 +703,7 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return parameter_list; - } - -@@ -714,11 +715,11 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return exception_list; - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -727,7 +728,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -766,7 +767,7 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return parameter_list; - } - -@@ -778,11 +779,11 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return exception_list; - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::ServerObject::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -791,7 +792,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -892,23 +893,23 @@ - static const class TAO_operation_db_entry wordlist[] = - { - {"",0},{"",0},{"",0},{"",0}, -- {"find", &POA_ImplementationRepository::Administration::find_skel}, -+ {"find", &POA_ImplementationRepository::Administration::find_skel}, - {"",0},{"",0},{"",0},{"",0}, - {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel}, - {"_interface", &POA_ImplementationRepository::Administration::_interface_skel}, - {"",0},{"",0}, -- {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, -- {"list", &POA_ImplementationRepository::Administration::list_skel}, -- {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, -+ {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel}, -+ {"list", &POA_ImplementationRepository::Administration::list_skel}, -+ {"register_server", &POA_ImplementationRepository::Administration::register_server_skel}, - {"",0}, -- {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, -+ {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel}, - {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel}, -- {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, -- {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, -+ {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel}, -+ {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel}, - {"",0}, -- {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, -+ {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel}, - {"",0},{"",0},{"",0},{"",0},{"",0}, -- {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, -+ {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) -@@ -944,14 +945,14 @@ - { - for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) - this->proxy_cache_[i] = 0; -- -+ - } - - POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_Strategized_Proxy_Broker (void) - { - for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) - delete this->proxy_cache_[i]; -- -+ - } - - ImplementationRepository::_TAO_Administration_Proxy_Impl& -@@ -962,25 +963,25 @@ - { - int strategy = - TAO_ORB_Core::collocation_strategy (object); -- -+ - if (this->proxy_cache_[strategy] != 0) - return *this->proxy_cache_[strategy]; -- -+ - this->create_proxy (strategy, ACE_TRY_ENV); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); -- -+ - return *this->proxy_cache_[strategy]; -- -+ - } - --void -+void - POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy ( - int strategy, - CORBA::Environment &ACE_TRY_ENV - ) - { - ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); -- -+ - if (this->proxy_cache_[strategy] == 0) - { - switch (strategy) -@@ -993,7 +994,7 @@ - ); - ACE_CHECK; - break; -- -+ - case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: - ACE_NEW_THROW_EX ( - this->proxy_cache_[strategy], -@@ -1002,7 +1003,7 @@ - ); - ACE_CHECK; - break; -- -+ - case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: - default: - ACE_NEW_THROW_EX ( -@@ -1012,9 +1013,9 @@ - ); - ACE_CHECK; - break; -- -+ - } -- -+ - } - } - -@@ -1035,14 +1036,14 @@ - ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (long _dummy_) - { - ACE_UNUSED_ARG (_dummy_); -- -- ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = -+ -+ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = - ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function; -- -+ - return 0; - } - --static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = -+static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer)); - - -@@ -1396,7 +1397,7 @@ - server, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server ( -@@ -1418,7 +1419,7 @@ - options, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server ( -@@ -1439,7 +1440,7 @@ - options, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server ( -@@ -1459,7 +1460,7 @@ - server, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server ( -@@ -1479,7 +1480,7 @@ - server, - ACE_TRY_ENV - ); -- -+ - } - - char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running ( -@@ -1503,7 +1504,7 @@ - server_object, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down ( -@@ -1523,7 +1524,7 @@ - server, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find ( -@@ -1545,7 +1546,7 @@ - info, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list ( -@@ -1568,7 +1569,7 @@ - server_iterator, - ACE_TRY_ENV - ); -- -+ - } - - -@@ -1593,14 +1594,14 @@ - - void POA_ImplementationRepository::Administration::activate_server_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); - CORBA::String_var server; - if (!( -@@ -1614,27 +1615,27 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ri ( - _tao_server_request, - _tao_impl, - server.in (), - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->activate_server ( - server.in (), - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -1642,7 +1643,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -1663,23 +1664,23 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::Administration::register_server_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); - CORBA::String_var server; - ImplementationRepository::StartupOptions options; -@@ -1695,7 +1696,7 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ri ( - _tao_server_request, - _tao_impl, -@@ -1703,21 +1704,21 @@ - options, - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->register_server ( - server.in (), - options, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -1725,7 +1726,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -1746,23 +1747,23 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::Administration::reregister_server_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); - CORBA::String_var server; - ImplementationRepository::StartupOptions options; -@@ -1778,7 +1779,7 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ri ( - _tao_server_request, - _tao_impl, -@@ -1786,21 +1787,21 @@ - options, - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->reregister_server ( - server.in (), - options, - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -1808,7 +1809,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -1829,23 +1830,23 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::Administration::remove_server_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); - CORBA::String_var server; - if (!( -@@ -1859,27 +1860,27 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ri ( - _tao_server_request, - _tao_impl, - server.in (), - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->remove_server ( - server.in (), - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -1887,7 +1888,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -1908,23 +1909,23 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::Administration::shutdown_server_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); - CORBA::String_var server; - if (!( -@@ -1938,27 +1939,27 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ri ( - _tao_server_request, - _tao_impl, - server.in (), - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->shutdown_server ( - server.in (), - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -1966,7 +1967,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -1987,23 +1988,23 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::Administration::server_is_running_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - CORBA::String_var _tao_retval; - CORBA::String_var server; - CORBA::String_var addr; -@@ -2021,7 +2022,7 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ri ( - _tao_server_request, - _tao_impl, -@@ -2030,14 +2031,14 @@ - server_object.in (), - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- _tao_retval = -+ _tao_retval = - _tao_impl->server_is_running ( - server.in (), - addr.in (), -@@ -2045,7 +2046,7 @@ - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - char * _tao_retval_info = _tao_retval._retn (); - ri.result (_tao_retval_info); -@@ -2056,7 +2057,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -2077,11 +2078,11 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - if (!( - (_tao_out << _tao_retval.in ()) - )) -@@ -2093,14 +2094,14 @@ - - void POA_ImplementationRepository::Administration::server_is_shutting_down_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); - CORBA::String_var server; - if (!( -@@ -2114,27 +2115,27 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri ( - _tao_server_request, - _tao_impl, - server.in (), - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->server_is_shutting_down ( - server.in (), - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -2142,7 +2143,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -2163,23 +2164,23 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::Administration::find_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - CORBA::String_var server; - ImplementationRepository::ServerInformation_var info; - if (!( -@@ -2193,28 +2194,28 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find ri ( - _tao_server_request, - _tao_impl, - server.in (), - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->find ( - server.in (), - info.out (), - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -2222,7 +2223,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -2243,11 +2244,11 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - if (!( - (_tao_out << info.in ()) - )) -@@ -2259,14 +2260,14 @@ - - void POA_ImplementationRepository::Administration::list_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *)_tao_object_reference; -- -+ - CORBA::ULong how_many; - ImplementationRepository::ServerInformationList_var server_list; - ImplementationRepository::ServerInformationIterator_var server_iterator; -@@ -2281,22 +2282,22 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ri ( - _tao_server_request, - _tao_impl, -- how_many -+ how_many - , - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->list ( - how_many, - server_list.out (), -@@ -2304,7 +2305,7 @@ - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -2312,7 +2313,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -2333,11 +2334,11 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - if (!( - (_tao_out << server_list.in ()) && - (_tao_out << server_iterator.in ()) -@@ -2349,7 +2350,7 @@ - } - - void POA_ImplementationRepository::Administration::_is_a_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -2361,10 +2362,10 @@ - CORBA::String_var value; - if (!(_tao_in >> value.out ())) - ACE_THROW (CORBA::MARSHAL ()); -- -+ - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; -- -+ - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -@@ -2372,7 +2373,7 @@ - } - - void POA_ImplementationRepository::Administration::_non_existent_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -2381,7 +2382,7 @@ - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; -- -+ - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -@@ -2389,7 +2390,7 @@ - } - - void POA_ImplementationRepository::Administration::_interface_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -2398,26 +2399,26 @@ - POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference; - CORBA_InterfaceDef_ptr _tao_retval = 0; - CORBA::Boolean _tao_result = 0; -- -+ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); -- -+ - if (_tao_adapter == 0) - { - ACE_THROW (CORBA::INTF_REPOS ()); - } -- -+ - ACE_TRY - { - _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - _tao_result = - _tao_adapter->interfacedef_cdr_insert ( - _tao_out, -@@ -2429,7 +2430,7 @@ - _tao_adapter->dispose (_tao_retval); - } - ACE_ENDTRY; -- -+ - if (_tao_result == 0) - { - ACE_THROW (CORBA::MARSHAL ()); -@@ -2443,7 +2444,7 @@ - { - const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) || - (!ACE_OS::strcmp ((char *)value, base_id))) -@@ -2478,14 +2479,14 @@ - { - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - CORBA::Object_ptr tmp = CORBA::Object::_nil (); -- -+ - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); - else - ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); -- -+ - CORBA::Object_var obj = tmp; - return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ()); - } -@@ -2511,14 +2512,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -2530,15 +2531,15 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}, - {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc} - }; -- -+ - exception_list->length (2); - for (CORBA::ULong i = 0; i < 2; ++i) - { -@@ -2550,7 +2551,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -2559,7 +2560,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -2602,20 +2603,20 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - CORBA::ULong length_options = parameter_list->length (); - parameter_list->length (length_options + 1); - (*parameter_list)[length_options].argument <<= this->options_; -- -+ - (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -2627,14 +2628,14 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc} - }; -- -+ - exception_list->length (1); - for (CORBA::ULong i = 0; i < 1; ++i) - { -@@ -2646,7 +2647,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -2655,7 +2656,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -2698,20 +2699,20 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - CORBA::ULong length_options = parameter_list->length (); - parameter_list->length (length_options + 1); - (*parameter_list)[length_options].argument <<= this->options_; -- -+ - (*parameter_list)[length_options].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -2723,11 +2724,11 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return exception_list; - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -2736,7 +2737,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -2777,14 +2778,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -2796,14 +2797,14 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} - }; -- -+ - exception_list->length (1); - for (CORBA::ULong i = 0; i < 1; ++i) - { -@@ -2815,7 +2816,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -2824,7 +2825,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -2865,14 +2866,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -2884,14 +2885,14 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} - }; -- -+ - exception_list->length (1); - for (CORBA::ULong i = 0; i < 1; ++i) - { -@@ -2903,7 +2904,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -2912,7 +2913,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -2957,25 +2958,25 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - CORBA::ULong length_addr = parameter_list->length (); - parameter_list->length (length_addr + 1); - (*parameter_list)[length_addr].argument <<= addr_; - (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN; -- -+ - CORBA::ULong length_server_object = parameter_list->length (); - parameter_list->length (length_server_object + 1); - (*parameter_list)[length_server_object].argument <<= this->server_object_; -- -+ - (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -2987,14 +2988,14 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} - }; -- -+ - exception_list->length (1); - for (CORBA::ULong i = 0; i < 1; ++i) - { -@@ -3006,7 +3007,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -3015,11 +3016,11 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - CORBA::Any_var safe_result_any = result_any; -- -+ - (*result_any) <<= this->_result; -- -+ - return safe_result_any._retn (); - } - -@@ -3041,7 +3042,7 @@ - return this->_tao_impl->_is_a (id, ACE_TRY_ENV); - } - --void -+void - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result) - { - // Update the result. -@@ -3067,14 +3068,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -3086,14 +3087,14 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} - }; -- -+ - exception_list->length (1); - for (CORBA::ULong i = 0; i < 1; ++i) - { -@@ -3105,7 +3106,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -3114,7 +3115,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -3155,14 +3156,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_server = parameter_list->length (); - parameter_list->length (length_server + 1); - (*parameter_list)[length_server].argument <<= server_; - (*parameter_list)[length_server].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -3174,14 +3175,14 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ExceptionList_var safe_exception_list = exception_list; -- -- static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = -+ -+ static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = - { - {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc} - }; -- -+ - exception_list->length (1); - for (CORBA::ULong i = 0; i < 1; ++i) - { -@@ -3193,7 +3194,7 @@ - return safe_exception_list._retn (); - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -3202,7 +3203,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -3227,13 +3228,13 @@ - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list ( - TAO_ServerRequest &_tao_server_request, - POA_ImplementationRepository::Administration *tao_impl, -- const CORBA::ULong & how_many -+ const CORBA::ULong & how_many - , - CORBA::Environment & - ) - : TAO_ServerRequestInfo (_tao_server_request), - _tao_impl (tao_impl), -- how_many_ (how_many) -+ how_many_ (how_many) - - {} - -@@ -3245,14 +3246,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_how_many = parameter_list->length (); - parameter_list->length (length_how_many + 1); - (*parameter_list)[length_how_many].argument <<= how_many_; - (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; -- -+ - - return safe_parameter_list._retn (); - } -@@ -3265,11 +3266,11 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return exception_list; - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::Administration::TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -3278,7 +3279,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - -@@ -3380,8 +3381,8 @@ - { - {"",0},{"",0},{"",0},{"",0},{"",0}, - {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel}, -- {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, -- {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, -+ {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel}, -+ {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel}, - {"",0},{"",0}, - {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel}, - {"",0},{"",0}, -@@ -3421,14 +3422,14 @@ - { - for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) - this->proxy_cache_[i] = 0; -- -+ - } - - POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void) - { - for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i) - delete this->proxy_cache_[i]; -- -+ - } - - ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl& -@@ -3439,25 +3440,25 @@ - { - int strategy = - TAO_ORB_Core::collocation_strategy (object); -- -+ - if (this->proxy_cache_[strategy] != 0) - return *this->proxy_cache_[strategy]; -- -+ - this->create_proxy (strategy, ACE_TRY_ENV); - ACE_CHECK_RETURN (*this->proxy_cache_[strategy]); -- -+ - return *this->proxy_cache_[strategy]; -- -+ - } - --void -+void - POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy ( - int strategy, - CORBA::Environment &ACE_TRY_ENV - ) - { - ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_); -- -+ - if (this->proxy_cache_[strategy] == 0) - { - switch (strategy) -@@ -3470,7 +3471,7 @@ - ); - ACE_CHECK; - break; -- -+ - case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY: - ACE_NEW_THROW_EX ( - this->proxy_cache_[strategy], -@@ -3479,7 +3480,7 @@ - ); - ACE_CHECK; - break; -- -+ - case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY: - default: - ACE_NEW_THROW_EX ( -@@ -3489,9 +3490,9 @@ - ); - ACE_CHECK; - break; -- -+ - } -- -+ - } - } - -@@ -3512,14 +3513,14 @@ - ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (long _dummy_) - { - ACE_UNUSED_ARG (_dummy_); -- -- ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = -+ -+ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = - ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function; -- -+ - return 0; - } - --static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = -+static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer)); - - -@@ -3627,7 +3628,7 @@ - server_list, - ACE_TRY_ENV - ); -- -+ - } - - void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy ( -@@ -3644,7 +3645,7 @@ - )->destroy ( - ACE_TRY_ENV - ); -- -+ - } - - -@@ -3669,14 +3670,14 @@ - - void POA_ImplementationRepository::ServerInformationIterator::next_n_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - TAO_InputCDR &_tao_in = _tao_server_request.incoming (); - POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; -- -+ - CORBA::Boolean _tao_retval = 0; - CORBA::ULong how_many; - ImplementationRepository::ServerInformationList_var server_list; -@@ -3691,28 +3692,28 @@ - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri ( - _tao_server_request, - _tao_impl, - how_many, - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- _tao_retval = -+ _tao_retval = - _tao_impl->next_n ( - how_many, - server_list.out (), - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - CORBA::Boolean _tao_retval_info = _tao_retval; - ri.result (_tao_retval_info); -@@ -3722,7 +3723,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -3743,11 +3744,11 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - if (!( - (_tao_out << CORBA::Any::from_boolean (_tao_retval)) && - (_tao_out << server_list.in ()) -@@ -3760,39 +3761,39 @@ - - void POA_ImplementationRepository::ServerInformationIterator::destroy_skel ( - TAO_ServerRequest &_tao_server_request, -- void *_tao_object_reference, -- void * /* context */, -+ void *_tao_object_reference, -+ void * /* context */, - CORBA::Environment &ACE_TRY_ENV - ) - { - POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *)_tao_object_reference; -- -+ - _tao_server_request.argument_flag (0); -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - TAO_ServerRequestInterceptor_Adapter _tao_vfr ( - _tao_server_request.orb_core ()->server_request_interceptors (), - _tao_server_request.interceptor_count () - ); -- -+ - POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri ( - _tao_server_request, - _tao_impl, - ACE_TRY_ENV - ); -- -+ - ACE_TRY - { - _tao_vfr.receive_request (&ri, ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_impl->destroy ( - ACE_TRY_ENV - ); - TAO_INTERCEPTOR_CHECK; -- -+ - #if (TAO_HAS_INTERCEPTORS == 1) - ri.reply_status (PortableInterceptor::SUCCESSFUL); - _tao_vfr.send_reply (&ri, ACE_TRY_ENV); -@@ -3800,7 +3801,7 @@ - } - ACE_CATCH (PortableInterceptor::ForwardRequest, exc) - { -- ri.forward_reference (exc); -+ ri.forward_reference (exc); - _tao_vfr.send_other ( - &ri, - ACE_TRY_ENV -@@ -3821,15 +3822,15 @@ - ACE_ENDTRY; - ACE_CHECK; - #endif /* TAO_HAS_INTERCEPTORS */ -- -+ - _tao_server_request.init_reply (); -- -+ - // In case ACE_TRY_ENV is not used in this function - ACE_UNUSED_ARG (ACE_TRY_ENV); - } - - void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -3841,10 +3842,10 @@ - CORBA::String_var value; - if (!(_tao_in >> value.out ())) - ACE_THROW (CORBA::MARSHAL ()); -- -+ - _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV); - ACE_CHECK; -- -+ - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -@@ -3852,7 +3853,7 @@ - } - - void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -3861,7 +3862,7 @@ - POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; - CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV); - ACE_CHECK; -- -+ - _tao_server_request.init_reply (); - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); - if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval))) -@@ -3869,7 +3870,7 @@ - } - - void POA_ImplementationRepository::ServerInformationIterator::_interface_skel ( -- TAO_ServerRequest &_tao_server_request, -+ TAO_ServerRequest &_tao_server_request, - void * _tao_object_reference, - void * /* context */, - CORBA::Environment &ACE_TRY_ENV -@@ -3878,26 +3879,26 @@ - POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference; - CORBA_InterfaceDef_ptr _tao_retval = 0; - CORBA::Boolean _tao_result = 0; -- -+ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); -- -+ - if (_tao_adapter == 0) - { - ACE_THROW (CORBA::INTF_REPOS ()); - } -- -+ - ACE_TRY - { - _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV); - ACE_TRY_CHECK; -- -+ - _tao_server_request.init_reply (); -- -+ - TAO_OutputCDR &_tao_out = _tao_server_request.outgoing (); -- -+ - _tao_result = - _tao_adapter->interfacedef_cdr_insert ( - _tao_out, -@@ -3909,7 +3910,7 @@ - _tao_adapter->dispose (_tao_retval); - } - ACE_ENDTRY; -- -+ - if (_tao_result == 0) - { - ACE_THROW (CORBA::MARSHAL ()); -@@ -3923,7 +3924,7 @@ - { - const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) || - (!ACE_OS::strcmp ((char *)value, base_id))) -@@ -3958,14 +3959,14 @@ - { - TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - CORBA::Object_ptr tmp = CORBA::Object::_nil (); -- -+ - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0); - else - ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0); -- -+ - CORBA::Object_var obj = tmp; - return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ()); - } -@@ -3991,14 +3992,14 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - Dynamic::ParameterList_var safe_parameter_list = parameter_list; -- -+ - CORBA::ULong length_how_many = parameter_list->length (); - parameter_list->length (length_how_many + 1); - (*parameter_list)[length_how_many].argument <<= how_many_; - (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN; -- -+ - return safe_parameter_list._retn (); - } - -@@ -4010,11 +4011,11 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return exception_list; - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -4023,11 +4024,11 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - CORBA::Any_var safe_result_any = result_any; -- -+ - (*result_any) <<= CORBA::Any::from_boolean (this->_result); -- -+ - return safe_result_any._retn (); - } - -@@ -4049,7 +4050,7 @@ - return this->_tao_impl->_is_a (id, ACE_TRY_ENV); - } - --void -+void - POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result) - { - // Update the result. -@@ -4073,7 +4074,7 @@ - Dynamic::ParameterList *parameter_list = - TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return parameter_list; - } - -@@ -4085,11 +4086,11 @@ - Dynamic::ExceptionList *exception_list = - TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return exception_list; - } - --CORBA::Any * -+CORBA::Any * - POA_ImplementationRepository::ServerInformationIterator::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) - { -@@ -4098,7 +4099,7 @@ - CORBA::Any *result_any = - TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); -- -+ - return result_any; - } - diff --git a/TAO/tao/diffs/ImplRepoS.h.diff b/TAO/tao/diffs/ImplRepoS.h.diff deleted file mode 100644 index c63563b9e76..00000000000 --- a/TAO/tao/diffs/ImplRepoS.h.diff +++ /dev/null @@ -1,799 +0,0 @@ ---- orig/ImplRepoS.h Mon Apr 30 20:24:45 2001 -+++ ImplRepoS.h Mon Apr 30 20:27:24 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -35,6 +35,8 @@ - #include "tao/PortableServer/Collocated_Object.h" - #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" - #include "tao/PortableServer/Direct_Object_Proxy_Impl.h" -+#include "tao/PortableServer/ServerRequestInfo.h" -+ - #if defined(_MSC_VER) - #if (_MSC_VER >= 1200) - #pragma warning(push) -@@ -146,6 +148,107 @@ - ); - - -+#if (TAO_HAS_INTERCEPTORS == 1) -+ // Generation of interceptors related RequestInfo classes per operation. -+ // This needed to be able to store the arguments, exceptions, contexts -+ // and build the lists dynamically on demand so that unnecessary time overhead -+ // of building these lists when they arent used is avoided. -+ class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::ServerObject; -+ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::ServerObject *tao_impl, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &); -+ -+ private: -+ POA_ImplementationRepository::ServerObject *_tao_impl; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::ServerObject; -+ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::ServerObject *tao_impl, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &); -+ -+ private: -+ POA_ImplementationRepository::ServerObject *_tao_impl; -+ -+ }; -+ -+ #endif /* TAO_HAS_INTERCEPTORS */ -+ - }; - - -@@ -166,6 +269,7 @@ - ); - - private: -+ - // Helper methods that takes care to create the proxy - // as soon as their use is necessary. - void create_proxy ( -@@ -173,6 +277,8 @@ - CORBA::Environment &ACE_TRY_ENV - ); - -+ private: -+ - // Caches the proxy implementations. The proxy implementation - // are totally stateless, and those can be shared by all the - // instances of a given IDL interface type. -@@ -223,9 +329,9 @@ - CORBA::SystemException - )); - -- - }; - -+ - // - // ThruPOA Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -@@ -502,6 +608,466 @@ - ); - - -+#if (TAO_HAS_INTERCEPTORS == 1) -+ // Generation of interceptors related RequestInfo classes per operation. -+ // This needed to be able to store the arguments, exceptions, contexts -+ // and build the lists dynamically on demand so that unnecessary time overhead -+ // of building these lists when they arent used is avoided. -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ const ImplementationRepository::StartupOptions & options, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ const ImplementationRepository::StartupOptions & options_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ const ImplementationRepository::StartupOptions & options, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ const ImplementationRepository::StartupOptions & options_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ const char * addr, -+ ImplementationRepository::ServerObject_ptr server_object, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ const char * addr_; -+ ImplementationRepository::ServerObject_ptr server_object_; -+ void result (char * result); -+ // update the result -+ char * _result; -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_find ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const char * server, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const char * server_; -+ -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::Administration; -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_list ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::Administration *tao_impl, -+ const CORBA::ULong & how_many -+, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &); -+ -+ private: -+ POA_ImplementationRepository::Administration *_tao_impl; -+ const CORBA::ULong & how_many_; -+ -+ -+ }; -+ -+ #endif /* TAO_HAS_INTERCEPTORS */ -+ - }; - - -@@ -522,6 +1088,7 @@ - ); - - private: -+ - // Helper methods that takes care to create the proxy - // as soon as their use is necessary. - void create_proxy ( -@@ -529,6 +1096,8 @@ - CORBA::Environment &ACE_TRY_ENV - ); - -+private: -+ - // Caches the proxy implementations. The proxy implementation - // are totally stateless, and those can be shared by all the - // instances of a given IDL interface type. -@@ -659,9 +1228,9 @@ - CORBA::SystemException - )); - -- - }; - -+ - // - // ThruPOA Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -@@ -884,6 +1453,111 @@ - ); - - -+#if (TAO_HAS_INTERCEPTORS == 1) -+ // Generation of interceptors related RequestInfo classes per operation. -+ // This needed to be able to store the arguments, exceptions, contexts -+ // and build the lists dynamically on demand so that unnecessary time overhead -+ // of building these lists when they arent used is avoided. -+ class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::ServerInformationIterator; -+ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::ServerInformationIterator *tao_impl, -+ const CORBA::ULong & how_many, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &); -+ -+ private: -+ POA_ImplementationRepository::ServerInformationIterator *_tao_impl; -+ const CORBA::ULong & how_many_; -+ void result (CORBA::Boolean result); -+ // update the result -+ CORBA::Boolean _result; -+ }; -+ -+ class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo -+ { -+ public: -+ friend class POA_ImplementationRepository::ServerInformationIterator; -+ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ( -+ TAO_ServerRequest &_tao_server_request, -+ POA_ImplementationRepository::ServerInformationIterator *tao_impl, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ -+ virtual Dynamic::ParameterList * arguments ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual Dynamic::ExceptionList * exceptions ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Any * result ( -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual char * target_most_derived_interface ( -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ virtual CORBA::Boolean target_is_a ( -+ const char * id, -+ CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) -+ ACE_THROW_SPEC ((CORBA::SystemException)); -+ -+ private: -+ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); -+ void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &); -+ -+ private: -+ POA_ImplementationRepository::ServerInformationIterator *_tao_impl; -+ -+ }; -+ -+ #endif /* TAO_HAS_INTERCEPTORS */ -+ - }; - - -@@ -904,6 +1578,7 @@ - ); - - private: -+ - // Helper methods that takes care to create the proxy - // as soon as their use is necessary. - void create_proxy ( -@@ -911,6 +1586,8 @@ - CORBA::Environment &ACE_TRY_ENV - ); - -+private: -+ - // Caches the proxy implementations. The proxy implementation - // are totally stateless, and those can be shared by all the - // instances of a given IDL interface type. -@@ -963,9 +1640,9 @@ - CORBA::SystemException - )); - -- - }; - -+ - // - // ThruPOA Proxy Impl. Declaration - /////////////////////////////////////////////////////////////////////// -@@ -1011,7 +1688,7 @@ - - - } --TAO_NAMESPACE_CLOSE // module ImplementationRepository -+TAO_NAMESPACE_CLOSE - - #include "ImplRepoS_T.h" - diff --git a/TAO/tao/diffs/ImplRepoS.i.diff b/TAO/tao/diffs/ImplRepoS.i.diff deleted file mode 100644 index 68ec05b4bf3..00000000000 --- a/TAO/tao/diffs/ImplRepoS.i.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- orig/ImplRepoS.i Mon Apr 30 20:24:45 2001 -+++ ImplRepoS.i Mon Apr 02 14:27:00 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: diff --git a/TAO/tao/diffs/ImplRepoS_T.cpp.diff b/TAO/tao/diffs/ImplRepoS_T.cpp.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/ImplRepoS_T.cpp.diff +++ /dev/null diff --git a/TAO/tao/diffs/ImplRepoS_T.h.diff b/TAO/tao/diffs/ImplRepoS_T.h.diff deleted file mode 100644 index e69de29bb2d..00000000000 --- a/TAO/tao/diffs/ImplRepoS_T.h.diff +++ /dev/null diff --git a/TAO/tao/diffs/ImplRepoS_T.i.diff b/TAO/tao/diffs/ImplRepoS_T.i.diff deleted file mode 100644 index 4120921d387..00000000000 --- a/TAO/tao/diffs/ImplRepoS_T.i.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- orig/ImplRepoS_T.i Mon Apr 30 20:24:45 2001 -+++ ImplRepoS_T.i Mon Apr 30 20:28:14 2001 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: |