From 7aa9fc442f7fa830226f128a0c72af6d3ae49905 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 12 Feb 2007 07:54:49 +0000 Subject: Mon Feb 12 06:50:14 UTC 2007 Johnny Willemsen --- TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp | 2 -- TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp | 3 --- TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h | 9 +++------ TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp | 5 ----- TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h | 18 ++++++------------ TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl | 1 - 6 files changed, 9 insertions(+), 29 deletions(-) (limited to 'TAO/orbsvcs/orbsvcs/ESF') diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index a51b175716f..5637669fa38 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -9,8 +9,6 @@ #include "orbsvcs/ESF/ESF_Copy_On_Write.inl" #endif /* __ACE_INLINE__ */ -#include "tao/Environment.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index 474ccde8989..29aa2402b68 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -23,7 +23,6 @@ TAO_ESF_Peer_Admin:: template void TAO_ESF_Peer_Admin:: peer_connected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Connected worker (peer); @@ -33,7 +32,6 @@ TAO_ESF_Peer_Admin:: template void TAO_ESF_Peer_Admin:: peer_reconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Reconnected worker (peer); @@ -43,7 +41,6 @@ TAO_ESF_Peer_Admin:: template void TAO_ESF_Peer_Admin:: peer_disconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Disconnected worker (peer); diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 5e1c81f3194..1333f171dc3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -69,8 +69,7 @@ public: * has invoked the connect_xxx_yyy() method. * The default implementation is a no-op. */ - virtual void peer_connected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void peer_connected (PEER *peer); /** * A has reconnected, i.e. its client has invoked the @@ -78,16 +77,14 @@ public: * The default implementation delegates on the collection * method */ - virtual void peer_reconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void peer_reconnected (PEER *peer); /** * A has been disconnected. The default implementation * removes the object from the collection and deactivates the * proxy. */ - virtual void peer_disconnected (PEER *peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void peer_disconnected (PEER *peer); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index 6c842836abc..e5952ed3a96 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -29,7 +29,6 @@ TAO_ESF_Proxy_Admin:: template INTERFACE* TAO_ESF_Proxy_Admin:: obtain (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PROXY* proxy; this->event_channel_->create_proxy (proxy); @@ -49,7 +48,6 @@ TAO_ESF_Proxy_Admin:: template void TAO_ESF_Proxy_Admin:: shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Shutdown_Proxy worker; @@ -62,14 +60,12 @@ TAO_ESF_Proxy_Admin:: template void TAO_ESF_Proxy_Admin:: connected (PROXY *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } template void TAO_ESF_Proxy_Admin:: reconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->collection_->reconnected (proxy); } @@ -77,7 +73,6 @@ TAO_ESF_Proxy_Admin:: template void TAO_ESF_Proxy_Admin:: disconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)) { proxy->deactivate (); // Cannot happen, just following the discipline. diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index e16e340bb1c..b3b2dd058a8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -72,8 +72,7 @@ public: virtual ~TAO_ESF_Proxy_Admin (void); /// Iterate over its internal collection. - void for_each (TAO_ESF_Worker *worker) - ACE_THROW_SPEC ((CORBA::SystemException)); + void for_each (TAO_ESF_Worker *worker); // @todo We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but // the MSVC compiler (v6.0) gets confused when we do so. So we have @@ -82,24 +81,21 @@ public: // code is supposed to run under TAO only. /// Create a new PROXY and activate it. virtual INTERFACE* - obtain (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + obtain (void); /** * The Event Channel that owns this Admin object is going * down. Invoke on all the proxies, cleanup the * collection and prepare to terminate. */ - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); /** * A has connected, this is invoked when the proxy's client * has invoked the connect_xxx_yyy() method. * The default implementation is a no-op. */ - virtual void connected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void connected (PROXY *proxy); /** * A has reconnected, i.e. its client has invoked the @@ -107,16 +103,14 @@ public: * The default implementation delegates on the collection * method */ - virtual void reconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reconnected (PROXY *proxy); /** * A has been disconnected. The default implementation * removes the object from the collection and deactivates the * proxy. */ - virtual void disconnected (PROXY *proxy) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnected (PROXY *proxy); protected: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl index dfb7f2a7429..f44945d45bf 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl @@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template ACE_INLINE void TAO_ESF_Proxy_Admin:: for_each (TAO_ESF_Worker

*worker) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->collection_->for_each (worker); } -- cgit v1.2.1