Mon Feb 12 11:40:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 18 insertions, 64 deletions

diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index afe0aa159a9..a463219700c 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -18,22 +18,18 @@ FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor (
 
 char *
 FOO_ClientRequestInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_ClientRequestInterceptor");
 }
 
 void
 FOO_ClientRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Verify that the tagged component that was supposed to be embedded
   // into the IOR by the FOO_IORInterceptor is actually in the IOR
@@ -88,29 +84,23 @@ FOO_ClientRequestInterceptor::send_request (
 void
 FOO_ClientRequestInterceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 FOO_ClientRequestInterceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index 8af1cbf2dcb..a8e4f93dbfd 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -60,34 +60,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index 733cbfe45b3..0200be0375c 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -13,14 +13,12 @@ void
 FOO_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::CodecFactory_var codec_factory =
     info->codec_factory ();
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index 4b69449d50b..fe42e85e5d2 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -54,13 +54,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index f776640a8e6..57fd9b42094 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -15,21 +15,18 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec)
 
 char *
 FOO_IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_IORInterceptor");
 }
 
 void
 FOO_IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // According to the Portable Interceptors specification,
   // IORInterceptor::establish_components() must not throw an
@@ -101,7 +98,6 @@ FOO_IORInterceptor::establish_components (
 void
 FOO_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct a dummy tagged component.
   IOP::TaggedComponent component;
@@ -160,7 +156,6 @@ void
 FOO_IORInterceptor::adapter_manager_state_changed (
     const char *,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -168,6 +163,5 @@ void
 FOO_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index 2072514f20b..6a699c40792 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -59,35 +59,25 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index b1c050af679..95d3c5babce 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -14,14 +14,12 @@ void
 FOO_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 FOO_IORInterceptor_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::CodecFactory_var codec_factory =
     info->codec_factory ();
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index 3904a3b239d..ce563c445fa 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -54,13 +54,11 @@ public:
   //@{
   /// The pre-initialization hook.
   virtual void pre_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
 
   /// The post-initialization hook.
   virtual void post_init (
-      PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index 1856b7702c3..058e6335a3d 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\"test_i\" is shutting down.\n"));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
index d21f3a0833f..2b0aa7217b5 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
@@ -34,8 +34,7 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// Shutdown the ORB.
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private: