Wed Feb 7 20:06:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 46 insertions, 46 deletions

diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index 40112cc0b5a..c829c3919a4 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -27,14 +27,14 @@ namespace Test
 
   void
   Client_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /* no-op */
   }
 
   // A specialization to handle client-side interceptors
   void Client_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     oii->add_client_request_interceptor (this->interceptor_.in ());
   }
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
index 8e7477ba8fe..b95ef80777b 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -37,10 +37,10 @@ namespace Test
     virtual ~Client_ORBInitializer (void);
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
     PortableInterceptor::ClientRequestInterceptor_var interceptor_;
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index f62ed6e1df1..416f20365b5 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -30,14 +30,14 @@ namespace Test
 
   char *
   Client_Request_Interceptor::name (void)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("Client_Request_Interceptor");
   }
 
   void
   Client_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    throw (CORBA::SystemException, CORBA::UserException)
+    ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("CRI    (%P|%t) Test accessing Transport Current from %s\n"),
@@ -61,13 +61,13 @@ namespace Test
 
   void
   Client_Request_Interceptor::destroy (void)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     //Test TC
     test_transport_current ("send_request");
@@ -106,28 +106,28 @@ namespace Test
 
   void
   Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     test_transport_current ("send_poll");
   }
 
   void
   Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     test_transport_current ("receive_reply");
   }
 
   void
   Client_Request_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_exception");
   }
 
   void
   Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_other");
   }
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
index 8b9d16adcc9..97b726a1fd2 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
@@ -68,25 +68,25 @@ namespace Test
      */
     //@{
     /// Return the name of this ClientRequestinterceptor.
-    virtual char * name (void) throw (CORBA::SystemException);
+    virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (void) throw (CORBA::SystemException);
+    virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
 
     virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
     virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
 
     virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
     //@}
 
     // Number of interceptions
@@ -96,7 +96,7 @@ namespace Test
     // Implementation method, every inteception point will have to
     // call it, supplying a name.
     void test_transport_current (const ACE_TCHAR* amethod)
-      throw (CORBA::SystemException, CORBA::UserException);
+      ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException));
 
   private:
     ///The ID of the ORB this interceptor is registered with.
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
index f8dfc3f3ef3..2e0a1a8a1bc 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
@@ -37,19 +37,19 @@ public:
   ~Current_Test_Impl (void);
 
   /// Main servant test method.
-  virtual void invoked_by_client (void) throw (CORBA::SystemException);
+  virtual void invoked_by_client (void) ACE_THROW_SPEC ((::CORBA::SystemException));
 
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
   virtual void invoked_during_upcall (void)
-    throw (CORBA::SystemException);
+    ACE_THROW_SPEC ((::CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (void) throw (CORBA::SystemException);
+  virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
   // A self-test for coherency
-  virtual ::CORBA::Long self_test (void) throw (CORBA::SystemException);
+  virtual ::CORBA::Long self_test (void) ACE_THROW_SPEC ((::CORBA::SystemException));
 
 public:
   /// Reports if unexpected errors have been encountered for the
@@ -57,11 +57,11 @@ public:
   bool is_successful (void) const;
 
 private:
-  void test_transport_current (void) throw (CORBA::SystemException);
+  void test_transport_current (void) ACE_THROW_SPEC ((::CORBA::SystemException));
 
   /// Main servant test method.
   void invoked_by_client_i (void)
-    throw (CORBA::SystemException, TAO::Transport::NoContext);
+    ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext));
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index 72cc1b34782..e7c4551b6ab 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -27,14 +27,14 @@ namespace Test
 
   void
   Server_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /* no-op */
   }
 
   // A specialization to handle client-side interceptors
   void Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     oii->add_server_request_interceptor (this->interceptor_.in ());
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
index f4a0c96fb07..a39ca925359 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -36,10 +36,10 @@ namespace Test
     virtual ~Server_ORBInitializer (void);
 
     virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
     PortableInterceptor::ServerRequestInterceptor_var interceptor_;
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 1f05e06e8ac..024c0f6fe77 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -25,7 +25,7 @@ namespace Test
 
   void
   Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
     ACE_DEBUG ((LM_DEBUG,
@@ -71,48 +71,48 @@ namespace Test
 
   char *
   Server_Request_Interceptor::name (void)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("SRI   ");
   }
 
   void
   Server_Request_Interceptor::destroy (void)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_request_service_contexts");
   }
 
   void
   Server_Request_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_request");
   }
 
   void
   Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException)
+    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     test_transport_current ("send_reply");
   }
 
   void
   Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("send_exception");
   }
 
   void
   Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-    throw (CORBA::SystemException, PortableInterceptor::ForwardRequest)
+    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("send_other");
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index f489156c2ae..b34c1ec6a4e 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -58,7 +58,7 @@ namespace Test
     virtual ~Server_Request_Interceptor (void);
 
     virtual void test_transport_current (const char* amethod)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     /// Coherency test
     virtual bool self_test (void);
@@ -73,24 +73,24 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void) throw (CORBA::SystemException);
+    virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void destroy (void) throw (CORBA::SystemException);
+    virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
 
     virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
 
     virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException);
+      ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
 
     virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      throw (CORBA::SystemException, PortableInterceptor::ForwardRequest);
+      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
     //@}
 
   protected: