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

10 files changed, 24 insertions, 88 deletions

diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
index 81394e0fdbd..2a0776226f0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp
@@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void)
 void
 Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var orb_id =
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
index c232ee05e1a..9850870f124 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h
@@ -31,11 +31,9 @@ public:
   /// Constructor
   Client_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
index 379d2a83186..b39d4b07273 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp
@@ -16,14 +16,12 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Install the Echo server request interceptor
   ACE_NEW_THROW_EX (this->server_interceptor_,
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
index 6db28e5db35..f9994a93d7a 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h
@@ -32,11 +32,9 @@ public:
   /// Constructor
   Server_ORBInitializer (void);
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 44121112bd8..f553d202517 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -30,21 +30,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void)
 
 char *
 Echo_Client_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Client_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do Nothing
 }
@@ -52,8 +49,6 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
@@ -178,7 +173,6 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
@@ -244,8 +238,6 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
@@ -288,8 +280,6 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   if (CORBA::is_nil (this->orb_.in ()))
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
index 705bce07974..8e8ec520789 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h
@@ -31,30 +31,20 @@ public:
   virtual ~Echo_Client_Request_Interceptor ();
   // dtor.
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
index f6e6374bcb4..5085db8c163 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp
@@ -34,7 +34,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void)
 
 void
 Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location)
-                                                    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward_location))
     throw CORBA::INV_OBJREF (
@@ -47,22 +46,18 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
 
 char *
 Echo_Server_Request_Interceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
 Echo_Server_Request_Interceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -125,8 +120,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
@@ -134,7 +127,6 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -181,8 +173,6 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 
   CORBA::String_var operation = ri->operation ();
@@ -229,8 +219,6 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
 {
   CORBA::String_var operation = ri->operation ();
 
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
index 064060a82ed..9e06f9fda85 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h
@@ -33,35 +33,23 @@ public:
   ~Echo_Server_Request_Interceptor ();
   // dotr.
 
-  void forward_reference (CORBA::Object_ptr forward_location)
-                          ACE_THROW_SPEC ((CORBA::SystemException));
+  void forward_reference (CORBA::Object_ptr forward_location);
 
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
   // Canonical name of the interceptor.
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+        PortableInterceptor::ServerRequestInfo_ptr);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
 private:
   const char *myname_;
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
index 925f856c0b5..0d201962ba4 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp
@@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
 Visual_i::nothing (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
 Visual_i::user (void)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n"));
   throw Test_Interceptors::Silly ();
@@ -37,7 +33,6 @@ Visual_i::user (void)
 
 void
 Visual_i::system (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
   throw CORBA::INV_OBJREF ();
@@ -45,7 +40,6 @@ Visual_i::system (void)
 
 void
 Visual_i::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
index cda32b963d9..e1130b91bfb 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h
@@ -28,21 +28,15 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void normal (CORBA::Long arg);
 
-  void nothing (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void nothing (void);
 
-  void user (void)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test_Interceptors::Silly));
+  void user (void);
 
-  void system (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void system (void);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private: