diff options
Diffstat (limited to 'TAO/tao/Strategies/DIOP_Profile.cpp')
| -rw-r--r-- | TAO/tao/Strategies/DIOP_Profile.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 9ce819cebb8..246a505e5ce 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -118,8 +118,7 @@ TAO_DIOP_Profile::decode_profile (TAO_InputCDR& cdr) } void -TAO_DIOP_Profile::parse_string_i (const char *ior - ACE_ENV_ARG_DECL) +TAO_DIOP_Profile::parse_string_i (const char *ior) { // Pull off the "hostname:port/" part of the objref // Copy the string because we are going to modify it... @@ -129,11 +128,11 @@ TAO_DIOP_Profile::parse_string_i (const char *ior if (okd == 0 || okd == ior) { // No object key delimiter or no hostname specified. - ACE_THROW (CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } // Length of host string. @@ -144,11 +143,11 @@ TAO_DIOP_Profile::parse_string_i (const char *ior if (cp_pos == ior) { // No hostname specified! It is required by the spec. - ACE_THROW (CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else if (cp_pos != 0) { @@ -198,11 +197,11 @@ TAO_DIOP_Profile::parse_string_i (const char *ior ACE_TEXT ("cannot determine hostname"))); // @@ What's the right exception to throw here? - ACE_THROW (CORBA::INV_OBJREF ( + throw ::CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, EINVAL), - CORBA::COMPLETED_NO)); + CORBA::COMPLETED_NO); } else this->endpoint_.host_ = CORBA::string_dup (tmp_host); @@ -238,8 +237,7 @@ TAO_DIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) } CORBA::ULong -TAO_DIOP_Profile::hash (CORBA::ULong max - ACE_ENV_ARG_DECL_NOT_USED) +TAO_DIOP_Profile::hash (CORBA::ULong max) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = 0; @@ -289,7 +287,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp) } char * -TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DIOP_Profile::to_string (void) { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), |