diff options
Diffstat (limited to 'TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp')
| -rw-r--r-- | TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index 5aade26a354..eb25db6608c 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -29,21 +29,21 @@ namespace TAO } char * - ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ObjectReferenceTemplate::server_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->server_id_); } char * - ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + ObjectReferenceTemplate::orb_id (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->orb_id_); } PortableInterceptor::AdapterName * - ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL) + ObjectReferenceTemplate::adapter_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::AdapterName *adapter_name = 0; @@ -56,7 +56,6 @@ namespace TAO TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); return adapter_name; } @@ -65,7 +64,7 @@ namespace TAO ObjectReferenceTemplate::make_object ( const char *, const PortableInterceptor::ObjectId & - ACE_ENV_ARG_DECL) + ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil(poa_.in())) @@ -73,7 +72,7 @@ namespace TAO TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in()); - return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER); + return tao_poa->invoke_key_to_object (); } } |