summaryrefslogtreecommitdiff
path: root/TAO/tao/TransportCurrent
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-02-11 12:51:42 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-02-11 12:51:42 +0000
commit684f4149bb62552bd083a246812149010a0d5278 (patch)
treee7cd895a2fa466e22075c21c31fc83ebc30f476d /TAO/tao/TransportCurrent
parentdf13612f36e202934137663b99b65394b07ae8cd (diff)
downloadATCD-684f4149bb62552bd083a246812149010a0d5278.tar.gz
Sun Feb 11 12:38:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/TransportCurrent')
-rw-r--r--TAO/tao/TransportCurrent/Current_Impl.cpp8
-rw-r--r--TAO/tao/TransportCurrent/Current_Impl.h24
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer.cpp1
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer.h3
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp2
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h8
-rw-r--r--TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp8
-rw-r--r--TAO/tao/TransportCurrent/IIOP_Current_Impl.h21
8 files changed, 20 insertions, 55 deletions
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 7fa3bae6832..e14dccf18ad 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -42,7 +42,6 @@ namespace TAO
/// thread.
const TAO_Transport*
Current_Impl::transport (void) const
- ACE_THROW_SPEC ((NoContext))
{
Transport_Selection_Guard* topguard =
Transport_Selection_Guard::current (this->core_, this->tss_slot_id_);
@@ -56,7 +55,6 @@ namespace TAO
/// Obtains the current transport's stats
const TAO::Transport::Stats*
Current_Impl::transport_stats (void) const
- ACE_THROW_SPEC ((NoContext))
{
static const TAO::Transport::Stats dummy;
@@ -66,7 +64,6 @@ namespace TAO
}
CORBA::Long Current_Impl::id (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
const TAO_Transport* t = this->transport ();
@@ -74,31 +71,26 @@ namespace TAO
}
CounterT Current_Impl::bytes_sent (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
return transport_stats ()->bytes_sent ();
}
CounterT Current_Impl::bytes_received (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
return transport_stats ()->bytes_received ();
}
CounterT Current_Impl::messages_sent (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
return transport_stats ()->messages_sent ();
}
CounterT Current_Impl::messages_received (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
return transport_stats ()->messages_received ();
}
TimeBase::TimeT Current_Impl::open_since (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
TimeBase::TimeT msecs = 0;
transport_stats ()->opened_since ().msec (msecs);
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 9463b35c01c..4fefe078e3f 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -49,23 +49,17 @@ namespace TAO
* PortableInterceptor::Current interface.
*/
//@{
- virtual CORBA::Long id (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual CORBA::Long id (void);
- virtual CounterT bytes_sent (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual CounterT bytes_sent (void);
- virtual CounterT bytes_received (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual CounterT bytes_received (void);
- virtual CounterT messages_sent (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual CounterT messages_sent (void);
- virtual CounterT messages_received (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual CounterT messages_received (void);
- virtual ::TimeBase::TimeT open_since (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual ::TimeBase::TimeT open_since (void);
//@}
protected:
@@ -75,14 +69,12 @@ namespace TAO
*/
//@{
/// A (strategy) method used to obtain the transport ptr
- const TAO_Transport* transport (void) const
- ACE_THROW_SPEC ((NoContext));
+ const TAO_Transport* transport (void) const;
/// A Stats instance. If protocol is unavailable (0) or the
/// TAO_HAS_TRANSPORT_CURRENT macro is defined as anything but
/// 1, a single static instance will be used.
- const TAO::Transport::Stats* transport_stats (void) const
- ACE_THROW_SPEC ((NoContext));
+ const TAO::Transport::Stats* transport_stats (void) const;
//@}
/// Destructor is protected to enforce the fact this class is
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
index 61300fa35aa..be55fa69b0a 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp
@@ -28,7 +28,6 @@ namespace TAO
TAO::Transport::Current_ptr
Current_ORBInitializer<Impl>::make_current_instance (TAO_ORB_Core* core,
size_t tss_slot_id)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
// Create the Current
Current_ptr tmp = 0;
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 516c6205c02..34487cd14a3 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -38,8 +38,7 @@ namespace TAO
protected:
virtual TAO::Transport::Current_ptr
- make_current_instance (TAO_ORB_Core* c, size_t s)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ make_current_instance (TAO_ORB_Core* c, size_t s);
};
}
}
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index 816f99d153c..aeae2652ebc 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -26,7 +26,6 @@ namespace TAO
void
Current_ORBInitializer_Base::pre_init (
PortableInterceptor::ORBInitInfo_ptr info)
- ACE_THROW_SPEC((CORBA::SystemException))
{
// Narrow to a TAO_ORBInitInfo object to get access to the
// allocate_tss_slot_id() TAO extension.
@@ -62,7 +61,6 @@ namespace TAO
void
Current_ORBInitializer_Base::post_init (
PortableInterceptor::ORBInitInfo_ptr)
- ACE_THROW_SPEC( (CORBA::SystemException) )
{
// do nothing
}
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index d2e10d98e36..d92da1f47b7 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -42,15 +42,13 @@ namespace TAO
Current_ORBInitializer_Base (const ACE_TCHAR* id);
virtual ~Current_ORBInitializer_Base (void);
- virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr);
- virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
- ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
protected:
virtual TAO::Transport::Current_ptr
make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id)
- ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+ = 0;
protected:
const ACE_TString id_;
};
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 7faecaeff6c..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,7 +26,6 @@ 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 ();
@@ -59,7 +59,6 @@ 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
@@ -72,7 +71,6 @@ namespace TAO
::SSLIOP::Current_ptr
IIOP_Current_Impl::ssliop_current (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
{
throw ::CORBA::NO_IMPLEMENT ();
}
@@ -80,7 +78,6 @@ namespace TAO
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 =
@@ -97,7 +94,6 @@ namespace TAO
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 =
@@ -114,7 +110,6 @@ namespace TAO
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 =
@@ -131,7 +126,6 @@ namespace TAO
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 =
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index acb48edcbe2..0495f17b6f4 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -51,23 +51,17 @@ namespace TAO
IIOP_Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id);
//@{
- virtual ::CORBA::Long id (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual ::CORBA::Long id (void);
- virtual ::SSLIOP::Current_ptr ssliop_current (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual ::SSLIOP::Current_ptr ssliop_current (void);
- virtual ::CORBA::Long remote_port (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual ::CORBA::Long remote_port (void);
- virtual char* remote_host (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual char* remote_host (void);
- virtual ::CORBA::Long local_port (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual ::CORBA::Long local_port (void);
- virtual char* local_host (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ virtual char* local_host (void);
//@}
@@ -87,8 +81,7 @@ namespace TAO
/// Transport. Will throw NO_IMPLEMENT if the (selected) transport
/// () == 0, or if transport->connection_handler () == 0. Will
/// throw NoContext, if no transport has been selected yet.
- TAO_IIOP_Connection_Handler* handler (void)
- ACE_THROW_SPEC ((::CORBA::SystemException, NoContext));
+ TAO_IIOP_Connection_Handler* handler (void);
private: