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

4 files changed, 9 insertions, 27 deletions

diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 16db8fe73e2..698098675db 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -14,27 +14,23 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
 
 void
 Oneway_Buffering::receive_data (const Test::Payload &the_payload)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_->request_received (the_payload.length ());
 }
 
 void
 Oneway_Buffering::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Oneway_Buffering::sync (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_->flush ();
 }
 
 void
 Oneway_Buffering::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index 9b32c9e4d58..b201e475f14 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -18,17 +18,13 @@ public:
                     Test::Oneway_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data (const Test::Payload &the_payload);
 
-  virtual void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void flush (void);
 
-  virtual void sync (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void sync (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to shutdown the application.
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 1525b0f0905..9f4733ac4e3 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -14,21 +14,18 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
 
 CORBA::ULong
 Oneway_Buffering_Admin::request_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
 Oneway_Buffering_Admin::bytes_received_count (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
 Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
   this->bytes_received_count_ += payload_length;
@@ -36,13 +33,11 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length)
 
 void
 Oneway_Buffering_Admin::flush (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Oneway_Buffering_Admin::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index 02272fd53bf..738b6d1f597 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -17,20 +17,15 @@ public:
   Oneway_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong request_count (void);
 
-  virtual CORBA::ULong bytes_received_count (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong bytes_received_count (void);
 
-  virtual void request_received (CORBA::ULong payload_length)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request_received (CORBA::ULong payload_length);
 
-  virtual void flush (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void flush (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   /// Use an ORB reference to shutdown the application.