diff options
Diffstat (limited to 'TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp')
| -rw-r--r-- | TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp index d66306b1aac..fa49fcf0104 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp @@ -4,6 +4,7 @@ #include "tao/IIOP_Connection_Handler.h" #include "tao/IIOP_Transport.h" #include "tao/Transport_Selection_Guard.h" +#include "tao/SystemException.h" #if TAO_HAS_TRANSPORT_CURRENT == 1 @@ -25,20 +26,19 @@ namespace TAO TAO_IIOP_Connection_Handler* IIOP_Current_Impl::handler (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) const TAO_Transport* t = this->transport (); if (t == 0) - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); TAO_Connection_Handler *ch = const_cast<TAO_Transport*>(t)->connection_handler (); if (ch == 0) - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); return dynamic_cast <TAO_IIOP_Connection_Handler*> (ch); #else - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); #endif } @@ -59,28 +59,25 @@ namespace TAO CORBA::Long IIOP_Current_Impl::id (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) // Need to use cast to pacify windows compilers complaining // about the implicit HANDLE -> CORBA::Long conversion. return (CORBA::Long) this->handler ()->get_handle (); #else - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); #endif } ::SSLIOP::Current_ptr IIOP_Current_Impl::ssliop_current (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); } CORBA::Long IIOP_Current_Impl::remote_port (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -91,13 +88,12 @@ namespace TAO return a.get_port_number (); #else - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); #endif } char* IIOP_Current_Impl::remote_host (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -108,13 +104,12 @@ namespace TAO return CORBA::string_dup (a.get_host_addr ()); #else - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); #endif } CORBA::Long IIOP_Current_Impl::local_port (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -125,13 +120,12 @@ namespace TAO return a.get_port_number (); #else - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); #endif } char* IIOP_Current_Impl::local_host (void) - ACE_THROW_SPEC ((::CORBA::SystemException, NoContext)) { #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) TAO_IIOP_Connection_Handler *iiopch = @@ -142,7 +136,7 @@ namespace TAO return CORBA::string_dup (a.get_host_addr ()); #else - ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0); + throw ::CORBA::NO_IMPLEMENT (); #endif } |