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

4 files changed, 12 insertions, 36 deletions

diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 48699b49cdd..60c59f02396 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -12,7 +12,6 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 
 void
 Peer_Handler_i::request (CORBA::Long retval)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static int i = 0;
   i++;
@@ -25,19 +24,16 @@ Peer_Handler_i::request (CORBA::Long retval)
 void
 Peer_Handler_i::request_excep (
     ::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Peer_Handler_i::start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Peer_Handler_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
 }
@@ -55,7 +51,6 @@ void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
               const ACE_Time_Value &delay)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->progress_ = Progress::_duplicate (progress);
@@ -69,14 +64,12 @@ Peer_i::init (CORBA::ORB_ptr orb,
 
 void
 Peer_i::reply (CORBA::Long result)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->progress_->recv_reply (result);
 }
 
 CORBA::Long
 Peer_i::request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
   ACE_OS::sleep (tv);
@@ -87,7 +80,6 @@ Peer_i::request (CORBA::Long id)
 void
 Peer_i::start (const PeerSet &the_peers,
                CORBA::Long iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
     this->reply_handler_._this ();
@@ -104,7 +96,6 @@ Peer_i::start (const PeerSet &the_peers,
 
 void
 Peer_i::shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index 99e5436445e..f778761bb69 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -27,17 +27,13 @@ public:
   Peer_Handler_i (Peer_i *peer);
   // The peer
 
-  virtual void request (CORBA::Long retval)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request (CORBA::Long retval);
 
-  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void request_excep (::Messaging::ExceptionHolder * excep_holder);
 
-  virtual void start (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   Peer_i *peer_;
@@ -55,24 +51,19 @@ public:
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
-             const ACE_Time_Value &delay)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+             const ACE_Time_Value &delay);
 
-  void reply (CORBA::Long result)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void reply (CORBA::Long result);
   // Used by the Reply_Handler to indicate that a reply has been
   // received.
 
    // = See test.idl for an explanation of these methods.
-  CORBA::Long request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long request (CORBA::Long id);
 
   void start (const PeerSet& the_peers,
-              CORBA::Long iterations)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+              CORBA::Long iterations);
 
-  void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (void);
 
 private:
   Peer_Handler_i reply_handler_;
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 4bf0e7e1054..d998c68fc29 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -16,7 +16,6 @@ Progress_i::Progress_i (Progress_Window *window)
 
 void
 Progress_i::sent_request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id));
   this->window_->sent_request (id);
@@ -24,14 +23,12 @@ Progress_i::sent_request (CORBA::Long id)
 
 void
 Progress_i::recv_reply (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->recv_reply (id);
 }
 
 CORBA::Long
 Progress_i::bind (Peer_ptr a_peer)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n"));
   return this->window_->bind (a_peer);
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 3761dd58206..7d9c8fbe9ee 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -73,12 +73,9 @@ public:
   // ctor
 
   // = The Progress methods.
-  void sent_request (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  void recv_reply (CORBA::Long id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  CORBA::Long bind (Peer_ptr a_peer)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void sent_request (CORBA::Long id);
+  void recv_reply (CORBA::Long id);
+  CORBA::Long bind (Peer_ptr a_peer);
 
 private:
   Progress_Window* window_;