Tue Oct 21 23:33:19 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

8 files changed, 5 insertions, 20 deletions

diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index f0a8ae0b4cb..79cdb4982d6 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -25,8 +25,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
@@ -37,7 +35,6 @@ CORBA::Boolean Messenger_i::send_message (
 }
 
 void Messenger_i::shutdown ()
-  throw(CORBA::SystemException)
 {
   orb_->shutdown(0);
 }
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
index 07e3829072f..3a2dff83972 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
@@ -30,11 +30,9 @@ public:
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
-  virtual void shutdown ()
-    throw(CORBA::SystemException);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index abb3fdbc848..df6eaf11a49 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -24,8 +24,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
@@ -34,4 +32,3 @@ CORBA::Boolean Messenger_i::send_message (
   message = CORBA::string_dup("Thanks for the message.");
   return 1;
 }
-  
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index 1ef3f40cf89..38741b7016f 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -28,8 +28,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char* /*subject*/,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   CORBA::string_free(message);
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
index 1ef3f40cf89..38741b7016f 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
@@ -28,8 +28,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char* /*subject*/,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   CORBA::string_free(message);
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };