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

9 files changed, 9 insertions, 31 deletions

diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index 6ce9fa45d76..2bd69013e64 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 1cad2f4c83d..fcfcb5239d2 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -66,7 +66,6 @@ Coordinator::shutdown_all_peers (void)
 
 void
 Coordinator::add_peer (Test::Peer_ptr peer)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
     return;
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 76bd88d5fa8..1f1c19bf448 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -31,8 +31,7 @@ public:
   void shutdown_all_peers (void);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void add_peer (Test::Peer_ptr peer);
 
 protected:
   /// Protected Destructor, call _remove_ref() instead
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index d6d4077ac20..77c338bdb63 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -21,7 +21,6 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
                       CORBA::ULong peer_count)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl = 0;
   ACE_NEW_THROW_EX (session_impl,
@@ -38,7 +37,6 @@ Peer::create_session (Test::Session_Control_ptr control,
 
 void
 Peer::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, waiting for threads\n"));
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 8f2d18e8445..c1c2777cbc4 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -24,10 +24,8 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                            CORBA::ULong peer_count);
+  virtual void shutdown (void);
 
 private:
   /// Keep a pointer to the ORB to shutdown cleanly
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index dd7003cb964..75e36862d98 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -114,9 +114,6 @@ Session::validate_connections (void)
 
 void
 Session::start (const Test::Session_List &other_sessions)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Test::Already_Running,
-                   Test::No_Peers))
 {
   if (other_sessions.length () == 0)
     throw Test::No_Peers ();
@@ -176,7 +173,6 @@ Session::ping (void) ACE_THROW_SPEC ((CORBA::SystemException))
 
 void
 Session::receive_payload (const Test::Payload &the_payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
     {
@@ -218,7 +214,6 @@ Session::receive_payload (const Test::Payload &the_payload)
 
 void
 Session::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
@@ -242,7 +237,6 @@ Session::more_work (void) const
 
 void
 Session::terminate (CORBA::Boolean success)
-  ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   try
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 8dc4dcaafab..d34af92249d 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -35,25 +35,18 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Test::Already_Running,
-                     Test::No_Peers));
+  virtual void start (const Test::Session_List &other_sessions);
 
-  virtual void ping (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void ping (void);
 
-  virtual void receive_payload (const Test::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_payload (const Test::Payload &the_payload);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success)
-    ACE_THROW_SPEC (());
+  void terminate (CORBA::Boolean success);
 
   /// Return 1 if all the work in this session has been completed
   int more_work (void) const;
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index fdd01686c9d..9c298313d19 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -42,7 +42,6 @@ Session_Control::~Session_Control (void)
 
 void
 Session_Control::session_finished (CORBA::Boolean success)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->session_count_ == 0)
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 3e12b1df5e1..2da60584c36 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -26,8 +26,7 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void session_finished (CORBA::Boolean success);
 
 private:
   /// Synchronize the internal state