diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServerObjectS.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/ServerObjectS.cpp | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/TAO/tao/PortableServer/ServerObjectS.cpp b/TAO/tao/PortableServer/ServerObjectS.cpp index 819dadbe9f7..d9fd6bd5281 100644 --- a/TAO/tao/PortableServer/ServerObjectS.cpp +++ b/TAO/tao/PortableServer/ServerObjectS.cpp @@ -574,7 +574,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:646 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -990,7 +990,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_ImplementationRepository::ServerObject *_tao_impl = - (POA_ImplementationRepository::ServerObject *) _tao_servant; + static_cast<POA_ImplementationRepository::ServerObject *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -1020,7 +1020,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel ( ) { POA_ImplementationRepository::ServerObject *_tao_impl = - (POA_ImplementationRepository::ServerObject *) _tao_servant; + static_cast<POA_ImplementationRepository::ServerObject *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1053,7 +1053,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel ( } POA_ImplementationRepository::ServerObject *_tao_impl = - (POA_ImplementationRepository::ServerObject *) _tao_servant; + static_cast<POA_ImplementationRepository::ServerObject *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1084,7 +1084,7 @@ void POA_ImplementationRepository::ServerObject::_component_skel ( ) { POA_ImplementationRepository::ServerObject *_tao_impl = - (POA_ImplementationRepository::ServerObject *) _tao_object_reference; + static_cast<POA_ImplementationRepository::ServerObject *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1142,7 +1142,7 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:582 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_ImplementationRepository::ServerObject::_dispatch ( TAO_ServerRequest &req, @@ -1157,7 +1157,7 @@ void POA_ImplementationRepository::ServerObject::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:524 +// be\be_visitor_interface/interface_ss.cpp:527 ImplementationRepository::ServerObject * POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -1168,22 +1168,14 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); 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::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); |