Sun Jul 15 13:01:49 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

60 files changed, 179 insertions, 227 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 82b0b9193fd..b3e0c32b3b8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,67 @@
+Sun Jul 15 13:01:49 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * docs/tutorials/Quoter/Event_Service/Stock_Consumer.h:
+        * docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp:
+        * docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h:
+        * docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp:
+        * docs/tutorials/Quoter/Naming_Service/Stock_i.h:
+        * docs/tutorials/Quoter/Naming_Service/Stock_i.cpp:
+        * docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h:
+        * docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp:
+        * docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h:
+        * docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp:
+        * docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h:
+        * docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp:
+        * docs/tutoriasls/Quoter/On_Demand_Activation/Stock_i.h:
+        * docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp:
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.h:
+        * docs/tutorials/Quoter/RTCORBA/Broker_i.cpp:
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.h:
+        * docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp:
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h:
+        * docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp:
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.h:
+        * docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp:
+        * docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h:
+        * docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp:
+        * docs/tutorials/Quoter/Simple/Persistent/Stock_i.h:
+        * docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp:
+        * docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h:
+        * docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp:
+        * docs/tutorials/Quoter/Simple/Server/Stock_i.h:
+        * docs/tutorials/Quoter/Simple/Server/Stock_i.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_XMLHandler.h:
+        * orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/LogACE_RB_Tree.h:
+        * orbsvcs/examples/FaultTolerance/RolyPoly/LogStdMap.h:
+        * orbsvcs/examples/LoadBalancing/Stock.h:
+        * orbsvcs/examples/LoadBalancing/Stock.cpp:
+        * orbsvcs/examples/LoadBalancing/StockFactory.h:
+        * orbsvcs/examples/LoadBalancing/StockFactory.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.h:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+        * orbsvcs/tests/Bug_2316_Regression/Test_impl.h:
+        * orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp:
+        * orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h:
+        * orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp:
+        * orbsvcs/tests/Notify/XML_Persistence/main.cpp:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+
+          Fixed Fuzz warnings regarding the usage of exception specification.
+
 Sun Jul 15 04:36:50 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * performance-tests/CSD_Strategy/TestInf/Makefile.am:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index ce6ce1ede7d..5bd630926c8 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -32,7 +32,6 @@ Stock_Consumer::disconnect ()
 
 void
 Stock_Consumer::push (const CORBA::Any& data)
-  throw (CORBA::SystemException)
 {
   Quoter::Event *event;
   if ((data >>= event) == 0)
@@ -46,7 +45,6 @@ Stock_Consumer::push (const CORBA::Any& data)
 
 void
 Stock_Consumer::disconnect_push_consumer (void)
-    throw (CORBA::SystemException)
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index 66c131b0c04..4c0fb2f1480 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -18,10 +18,8 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const CORBA::Any& data)
-    throw (CORBA::SystemException);
-  void disconnect_push_consumer (void)
-    throw (CORBA::SystemException);
+  void push (const CORBA::Any& data);
+  void disconnect_push_consumer (void);
 
 private:
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp
index eecf91e48f8..e09c66ed1a9 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.cpp
@@ -12,7 +12,6 @@ Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
     return this->rhat_._this ();
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h
index c0e51d1b3ea..715c7a8c5f2 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_Factory_i.h
@@ -11,8 +11,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
   Quoter_Stock_Factory_i ();
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 
 private:
   Quoter_Stock_i rhat_;
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp
index 6149cb79c36..be99840deab 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.cpp
@@ -14,19 +14,19 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
 }
 
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Quoter_Stock_i::full_name () throw (CORBA::SystemException)
+Quoter_Stock_i::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Quoter_Stock_i::price () throw (CORBA::SystemException)
+Quoter_Stock_i::price ()
 {
   return this->price_;
 }
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h
index 9c9607415a2..9a58df1c966 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Stock_i.h
@@ -14,9 +14,9 @@ public:
                   const char *full_name,
                   CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
index 1167c78c3e0..0df4e1f7363 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.cpp
@@ -15,7 +15,6 @@ void
 Single_Query_Stock_Handler_i::get_price_and_names (CORBA::Double ami_return_val,
                                                   const char *symbol,
                                                   const char *full_name)
-  throw (CORBA::SystemException)
 {
   cout << "The price of one stock in \""
        << full_name << "\" (" << symbol << ") is "
@@ -26,7 +25,6 @@ Single_Query_Stock_Handler_i::get_price_and_names (CORBA::Double ami_return_val,
 void
 Single_Query_Stock_Handler_i::
     get_price_and_names_excep (::Messaging::ExceptionHolder *)
-  throw (CORBA::SystemException)
 {
   // We ignore the exception, but this counts as a reponse, otherwise
   // the application would not finish.
@@ -38,45 +36,37 @@ Single_Query_Stock_Handler_i::
 
 void
 Single_Query_Stock_Handler_i::get_symbol (const char *)
-  throw (CORBA::SystemException)
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-Single_Query_Stock_Handler_i::
-    get_symbol_excep (::Messaging::ExceptionHolder *)
-  throw (CORBA::SystemException)
+Single_Query_Stock_Handler_i::get_symbol_excep (::Messaging::ExceptionHolder *)
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 Single_Query_Stock_Handler_i::get_full_name (const char *)
-  throw (CORBA::SystemException)
 {
     throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 Single_Query_Stock_Handler_i::
-   get_full_name_excep (::Messaging::ExceptionHolder *)
-  throw (CORBA::SystemException)
+get_full_name_excep (::Messaging::ExceptionHolder *)
 {
     throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 Single_Query_Stock_Handler_i::price (double)
-  throw (CORBA::SystemException)
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 void
-Single_Query_Stock_Handler_i::
-    price_excep (::Messaging::ExceptionHolder *)
-  throw (CORBA::SystemException)
+Single_Query_Stock_Handler_i::price_excep (::Messaging::ExceptionHolder *)
 {
     throw CORBA::NO_IMPLEMENT ();
 }
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
index b595d53be86..13109109c7f 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h
@@ -14,26 +14,18 @@ public:
 
   void get_price_and_names (CORBA::Double ami_return_val,
                            const char *symbol,
-                           const char *full_name)
-      throw (CORBA::SystemException);
-
-  void get_price_and_names_excep (::Messaging::ExceptionHolder *)
-    throw (CORBA::SystemException);
-
-  void get_symbol(const char *)
-    throw (CORBA::SystemException);
-  void get_symbol_excep (::Messaging::ExceptionHolder *)
-    throw (CORBA::SystemException);
-
-  void get_full_name (const char *)
-    throw (CORBA::SystemException);
-  void get_full_name_excep (::Messaging::ExceptionHolder *)
-    throw (CORBA::SystemException);
-
-  void price (double)
-    throw (CORBA::SystemException);
-  void price_excep (::Messaging::ExceptionHolder *)
-    throw (CORBA::SystemException);
+                           const char *full_name);
+
+  void get_price_and_names_excep (::Messaging::ExceptionHolder *);
+
+  void get_symbol(const char *);
+  void get_symbol_excep (::Messaging::ExceptionHolder *);
+
+  void get_full_name (const char *);
+  void get_full_name_excep (::Messaging::ExceptionHolder *);
+
+  void price (double);
+  void price_excep (::Messaging::ExceptionHolder *);
 
 private:
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
index 7deb0e82669..9734edddfc7 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
@@ -14,7 +14,6 @@ Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
                                            PortableServer::POA_ptr,
                                            const char *,
                                            void * & cookie)
-  throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
 
   // Check to see if the object ID is valid
@@ -48,12 +47,10 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                             const char *,
                                             void * cookie,
                                             PortableServer::Servant servant)
-  throw (CORBA::SystemException)
 {
 
   // Delete the servant as it is no longer needed.
   PortableServer::Servant my_servant = (PortableServer::Servant) cookie;
   if (servant == my_servant)
     delete servant;
-
 }
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index fb3c89199d0..08f0b6e0145 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -18,16 +18,14 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa,
                                              const char * operation,
-                                             void * & cookie)
-    throw (CORBA::SystemException, PortableServer::ForwardRequest);
+                                             void * & cookie);
 
   // Postinvoke function
   virtual void postinvoke (const PortableServer::ObjectId & oid,
                            PortableServer::POA_ptr poa,
                            const char * operation,
                            void * cookie,
-                           PortableServer::Servant servant)
-    throw (CORBA::SystemException);
+                           PortableServer::Servant servant);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp
index de28a6c5c05..ec5d0dcd73f 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.cpp
@@ -8,7 +8,6 @@ Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
     Quoter_Stock_i *rhat = new Quoter_Stock_i ("RHAT", "RedHat, Inc.", 210);
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h
index 27103cce23b..b6565631432 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_i.h
@@ -10,8 +10,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
   Quoter_Stock_Factory_i ();
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 };
 
 #endif /* TAO_TUTORIAL_QUOTER_SIMPLE_SERVER_STOCK_FACTORY_I_H */
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
index 4e23bb6e618..23a2bb46f12 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp
@@ -14,19 +14,19 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
 }
 
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Quoter_Stock_i::full_name () throw (CORBA::SystemException)
+Quoter_Stock_i::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Quoter_Stock_i::price () throw (CORBA::SystemException)
+Quoter_Stock_i::price ()
 {
   return this->price_;
 }
@@ -34,7 +34,6 @@ Quoter_Stock_i::price () throw (CORBA::SystemException)
 CORBA::Double
 Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol,
                                      CORBA::String_out full_name)
-                                     throw (CORBA::SystemException)
 {
   symbol = CORBA::string_dup (this->symbol_.c_str ());
   full_name = CORBA::string_dup (this->full_name_.c_str ());
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h
index 27163f9d2a0..88a51548962 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.h
@@ -14,12 +14,11 @@ public:
                   const char *full_name,
                   CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
   CORBA::Double get_price_and_names (CORBA::String_out symbol,
-                                     CORBA::String_out full_name)
-    throw (CORBA::SystemException);
+                                     CORBA::String_out full_name);
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
index 6c6e7193fbe..afb1f746139 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp
@@ -62,20 +62,17 @@ Stock_StockBroker_i::~Stock_StockBroker_i (void)
 }
 
 ::Stock::StockNameConsumer_ptr Stock_StockBroker_i::get_consumer_notifier ()
-  throw (::CORBA::SystemException)
 {
   Stock::StockNameConsumer_var consumer = this->consumer_->_this ();
   return consumer._retn();
 }
 
 void Stock_StockBroker_i::connect_quoter_info (::Stock::StockQuoter_ptr c)
-  throw (::CORBA::SystemException)
 {
   this->quoter_ = Stock::StockQuoter::_duplicate (c);
 }
 
 ::Stock::StockQuoter_ptr Stock_StockBroker_i::disconnect_quoter_info ()
-  throw (::CORBA::SystemException)
 {
   Stock::StockQuoter_var old_quoter = this->quoter_;
   this->quoter_ = Stock::StockQuoter::_nil();
@@ -83,14 +80,12 @@ void Stock_StockBroker_i::connect_quoter_info (::Stock::StockQuoter_ptr c)
 }
 
 ::Stock::StockQuoter_ptr Stock_StockBroker_i::get_connection_quoter_info ()
-  throw (::CORBA::SystemException)
 {
   return Stock::StockQuoter::_duplicate (this->quoter_);
 }
 
 void 
 Stock_StockBroker_i::shutdown (void)
-  throw (::CORBA::SystemException)
 {
   // Unsubscribe
   ACE_DEBUG ((LM_DEBUG, "Shutdown unsubscribing notifiers\n"));
@@ -140,7 +135,6 @@ Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i (void)
 ::Stock::StockBroker_ptr 
 Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist,
                                  const char *stock_name)
-  throw (::CORBA::SystemException)
 {
   if (CORBA::is_nil (this->broker_.in ()))
     {
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
index 34cf6d7ebad..fddf03be3a2 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h
@@ -46,24 +46,21 @@ public:
    *
    * @return Returns a StockNameConsumer object reference.
    */
-  virtual ::Stock::StockNameConsumer_ptr get_consumer_notifier ()
-    throw (::CORBA::SystemException);
+  virtual ::Stock::StockNameConsumer_ptr get_consumer_notifier ();
 
   /**
    * Duplicate a StockQuoter object using the StockQuoter object reference "c" in the argument.
    *
    * @param c A StockQuoter object reference.
    */
-  virtual void connect_quoter_info (::Stock::StockQuoter_ptr c)
-    throw (::CORBA::SystemException);
+  virtual void connect_quoter_info (::Stock::StockQuoter_ptr c);
 
   /**
    * Destroy the StockQuoter object and return it.
    *
    * @return Returns the destroyed StockQuoter object reference.
    */
-  virtual ::Stock::StockQuoter_ptr disconnect_quoter_info ()
-    throw (::CORBA::SystemException);
+  virtual ::Stock::StockQuoter_ptr disconnect_quoter_info ();
 
   /**
    * Return the StockQuoter object.
@@ -71,14 +68,12 @@ public:
    * @return Returns the StockQuoter object reference that has been
    *         created by connect_quoter_info (). 
    */
-  virtual ::Stock::StockQuoter_ptr get_connection_quoter_info ()
-    throw (::CORBA::SystemException);
+  virtual ::Stock::StockQuoter_ptr get_connection_quoter_info ();
 
   /**
    * Shutdown the object and destroy the application.
    */
-  virtual void shutdown ()
-    throw (::CORBA::SystemException);
+  virtual void shutdown ();
   
 private:
   // Cached ORB pointer
@@ -123,8 +118,7 @@ public:
    * @return The StockBroker object created by the Constructor.
    */
   virtual ::Stock::StockBroker_ptr create (Stock::StockDistributor_ptr dist,
-                                           const char *stock_name)
-    throw (::CORBA::SystemException);
+                                           const char *stock_name);
 
   virtual int handle_signal (int signum,
                              siginfo_t * = 0,
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index a9b28de02b7..997ab026d84 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -37,7 +37,6 @@ StockDistributor_i::~StockDistributor_i (void)
 ::Stock::Cookie *
 StockDistributor_i::subscribe_notifier (::Stock::StockNameConsumer_ptr c,
                                               ::RTCORBA::Priority priority)
-  throw (::CORBA::SystemException)
 {
   // Get mutual exclusion of the <subscribers_list_>.
   ACE_WRITE_GUARD_RETURN (ACE_RW_Thread_Mutex, g, lock_, 0);
@@ -62,8 +61,6 @@ StockDistributor_i::subscribe_notifier (::Stock::StockNameConsumer_ptr c,
 
 ::Stock::StockNameConsumer_ptr
 StockDistributor_i::unsubscribe_notifier (::Stock::Cookie *ck)
-  throw (::CORBA::SystemException,
-         ::Stock::Invalid_Subscription)
 {
   if (ck == 0)
     {
@@ -93,8 +90,6 @@ StockDistributor_i::unsubscribe_notifier (::Stock::Cookie *ck)
 
 ::Stock::StockQuoter_ptr
 StockDistributor_i::provide_quoter_info (::Stock::Cookie *ck)
-  throw (::CORBA::SystemException,
-         ::Stock::Invalid_Subscription)
 {
   ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex, guard, lock_, 0);
 
@@ -133,14 +128,12 @@ StockDistributor_i::provide_quoter_info (::Stock::Cookie *ck)
 
 ::CORBA::Long
 StockDistributor_i::notification_rate ()
-  throw (::CORBA::SystemException)
 {
   return this->rate_;
 }
 
 void
 StockDistributor_i::notification_rate (::CORBA::Long notification_rate)
-  throw (::CORBA::SystemException)
 {
   this->rate_ = notification_rate;
   STOCK_DATABASE->update_rate (this->rate_);
@@ -148,21 +141,18 @@ StockDistributor_i::notification_rate (::CORBA::Long notification_rate)
 
 void
 StockDistributor_i::start ()
-  throw (::CORBA::SystemException)
 {
   STOCK_DATABASE->start ();
 }
 
 void
 StockDistributor_i::stop ()
-  throw (::CORBA::SystemException)
 {
   STOCK_DATABASE->stop ();
 }
 
 void
 StockDistributor_i::shutdown ()
-  throw (::CORBA::SystemException)
 {
   ACE_DEBUG ((LM_DEBUG, "Stopping publisher\n"));
   // Stop publishing events
@@ -264,7 +254,6 @@ StockQuoter_i::~StockQuoter_i (void)
 
 ::Stock::StockInfo *
 StockQuoter_i::get_stock_info (const char * stock_name)
-  throw (::CORBA::SystemException, ::Stock::Invalid_Stock)
 {
   // Obtain the stock information from the database.
   ACE_DEBUG ((LM_DEBUG, "*** message: requesting stock_info from the database\n"));
@@ -370,7 +359,6 @@ StockDistributorHome_i::~StockDistributorHome_i (void)
 
 ::Stock::StockDistributor_ptr
 StockDistributorHome_i::create ()
-  throw (::CORBA::SystemException)
 {
   CORBA::Object_var obj;
 
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
index a369650d184..e7ecf716956 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h
@@ -57,8 +57,7 @@ public:
    * @return A Cookie object that records this subscription.
    */
   virtual ::Stock::Cookie * subscribe_notifier (::Stock::StockNameConsumer_ptr c, 
-                                                ::RTCORBA::Priority priority)
-    throw (::CORBA::SystemException);
+                                                ::RTCORBA::Priority priority);
 
   /**
    * Erase the StockNameConsumer object from the StockDistributor object's subscribers' map.
@@ -66,50 +65,41 @@ public:
    * @param ck The Cookie object that records the subscription.
    * @param The reference of the StockNameConsumer object that has been erased.
    */
-  virtual ::Stock::StockNameConsumer_ptr unsubscribe_notifier (::Stock::Cookie *ck)
-    throw (::CORBA::SystemException,
-           ::Stock::Invalid_Subscription);
+  virtual ::Stock::StockNameConsumer_ptr unsubscribe_notifier (::Stock::Cookie *ck);
 
   /**
    * Return the StockQuoter object created by the Constructor.
    *
    * @return A StockQuoter object created by this StockDistributor object.
    */
-  virtual ::Stock::StockQuoter_ptr provide_quoter_info (::Stock::Cookie *ck)
-    throw (::CORBA::SystemException,
-           ::Stock::Invalid_Subscription);
+  virtual ::Stock::StockQuoter_ptr provide_quoter_info (::Stock::Cookie *ck);
 
   /**
    * Get the notification_rate attribute.
    *
    * @return The notification_rate attribute.
    */
-  virtual ::CORBA::Long notification_rate ()
-    throw (::CORBA::SystemException);
+  virtual ::CORBA::Long notification_rate ();
 
   /**
    * Set the notification_rate attribute.
    *
    * @param notification_rate The value of notification_rate attribute that need to be set.
    */
-  virtual void notification_rate (::CORBA::Long notification_rate)
-    throw (::CORBA::SystemException);
+  virtual void notification_rate (::CORBA::Long notification_rate);
 
   /**
    * Set the active state of the StockDistributor object to true and create a thread 
    * to publish the stock information to the Stock Broker clients.
    */
-  virtual void start (void)
-    throw (::CORBA::SystemException);
+  virtual void start (void);
 
   /**
    * Set the active state of StockDistributor object to false.
    */
-  virtual void stop (void)
-    throw (::CORBA::SystemException);
+  virtual void stop (void);
   
-  virtual void shutdown ()
-    throw (::CORBA::SystemException);
+  virtual void shutdown ();
   
   /// Callback for stock database.
   void operator () (std::vector <std::string> &stocks);
@@ -160,8 +150,7 @@ public:
    * @param stock_name The name of the stock whose detailed info is needed.
    * @throw ::Stock::Invalid_Stock
    */
-  virtual ::Stock::StockInfo *get_stock_info (const char *stock_name)
-    throw (::CORBA::SystemException, ::Stock::Invalid_Stock);
+  virtual ::Stock::StockInfo *get_stock_info (const char *stock_name);
 };
 
 /**
@@ -190,8 +179,7 @@ public:
    * 
    * @return The StockDistributor object created by the Constructor.
    */
-  virtual ::Stock::StockDistributor_ptr create ()
-    throw (::CORBA::SystemException);
+  virtual ::Stock::StockDistributor_ptr create ();
   
   virtual int handle_signal (int signum,
                              siginfo_t * = 0,
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
index a7f3f642c2c..e64df8236c5 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp
@@ -18,7 +18,6 @@ Stock_StockNameConsumer_i::~Stock_StockNameConsumer_i (void)
 }
 
 void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockname)
-  throw (::CORBA::SystemException)
 {
   for (CORBA::ULong i = 0;
        i < the_stockname->names ().length ();
@@ -62,14 +61,12 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna
 
 ::Stock::Cookie *
 Stock_StockNameConsumer_i::cookie ()
-  throw (::CORBA::SystemException)
 {
   return this->cookie_.in ();
 }
 
 void
 Stock_StockNameConsumer_i::cookie (::Stock::Cookie *cookie)
-  throw (::CORBA::SystemException)
 {
   this->cookie_ = cookie;
   cookie->_add_ref ();
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
index b2586fa142e..faf821af085 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h
@@ -56,24 +56,21 @@ public:
    *
    * @param the_stockname The name of the stock that will be provided to the context StockBroker object.
    */
-  virtual void push_StockName (::Stock::StockNames *the_stockname)
-    throw (::CORBA::SystemException);
+  virtual void push_StockName (::Stock::StockNames *the_stockname);
   
   /**
    * Get the cookie attribute.
    *
    * @return The cookie attribute.
    */
-  virtual ::Stock::Cookie * cookie ()
-    throw (::CORBA::SystemException);
+  virtual ::Stock::Cookie * cookie ();
 
   /**
    * Set the cookie attribute.
    *
    * @param cookie The value of cookie attribute that need to be set.
    */
-  virtual void cookie (::Stock::Cookie *cookie)
-    throw (::CORBA::SystemException);
+  virtual void cookie (::Stock::Cookie *cookie);
 
 private:
   /// Context of the StockNameConsumer object.
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
index c6b5ccdc608..8e3e874fe6f 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h
@@ -85,7 +85,7 @@ public:
    * @param name The name of the stock.
    * @return A StockInfo object.
    */
-  StockInfo get_stock_info (const char *name) throw (Invalid_Stock);
+  StockInfo get_stock_info (const char *name);
   
   /**
    * This function is used to calculate the new high, low and last values
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
index 74b0df2c709..6ceeae1da4f 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp
@@ -75,7 +75,6 @@ Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap,
 template <typename CALLBACK>
 typename Stock_Database<CALLBACK>::StockInfo 
 Stock_Database<CALLBACK>::get_stock_info(const char *name)
-  throw (Invalid_Stock)
 {
   ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex,
                          guard,
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp
index eecf91e48f8..e09c66ed1a9 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.cpp
@@ -12,7 +12,6 @@ Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
     return this->rhat_._this ();
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h
index c0e51d1b3ea..715c7a8c5f2 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_Factory_i.h
@@ -11,8 +11,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
   Quoter_Stock_Factory_i ();
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 
 private:
   Quoter_Stock_i rhat_;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp
index 6149cb79c36..be99840deab 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.cpp
@@ -14,19 +14,19 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
 }
 
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Quoter_Stock_i::full_name () throw (CORBA::SystemException)
+Quoter_Stock_i::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Quoter_Stock_i::price () throw (CORBA::SystemException)
+Quoter_Stock_i::price ()
 {
   return this->price_;
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h
index 9c41dff6ee0..502655ec1fa 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Stock_i.h
@@ -14,9 +14,9 @@ public:
                   const char *full_name,
                   CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
index 156bb8991de..0623650f173 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp
@@ -11,7 +11,6 @@ Quoter_Stock_Factory_i::Quoter_Stock_Factory_i (PortableServer::POA_ptr poa)
 
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId (symbol);
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h
index fcd68a45587..4997fd8335f 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.h
@@ -16,8 +16,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
   Quoter_Stock_Factory_i (PortableServer::POA_ptr stock_factory_poa);
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 
 private:
   PortableServer::POA_var stock_factory_poa_;
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp
index 6149cb79c36..be99840deab 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.cpp
@@ -14,19 +14,19 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
 }
 
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Quoter_Stock_i::full_name () throw (CORBA::SystemException)
+Quoter_Stock_i::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Quoter_Stock_i::price () throw (CORBA::SystemException)
+Quoter_Stock_i::price ()
 {
   return this->price_;
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h
index 55e0530d057..4cbbf57f5a5 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_i.h
@@ -21,9 +21,9 @@ public:
                   const char *full_name,
                   CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp
index eecf91e48f8..e09c66ed1a9 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.cpp
@@ -12,7 +12,6 @@ Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
     return this->rhat_._this ();
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h
index c0e51d1b3ea..715c7a8c5f2 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_Factory_i.h
@@ -11,8 +11,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
   Quoter_Stock_Factory_i ();
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 
 private:
   Quoter_Stock_i rhat_;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp
index 6149cb79c36..be99840deab 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.cpp
@@ -14,19 +14,19 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
 }
 
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Quoter_Stock_i::full_name () throw (CORBA::SystemException)
+Quoter_Stock_i::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Quoter_Stock_i::price () throw (CORBA::SystemException)
+Quoter_Stock_i::price ()
 {
   return this->price_;
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h
index 9c41dff6ee0..502655ec1fa 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Stock_i.h
@@ -14,9 +14,9 @@ public:
                   const char *full_name,
                   CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp
index eecf91e48f8..e09c66ed1a9 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.cpp
@@ -12,7 +12,6 @@ Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 
 Quoter::Stock_ptr
 Quoter_Stock_Factory_i::get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol)
 {
   if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
     return this->rhat_._this ();
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h
index c0e51d1b3ea..715c7a8c5f2 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_Factory_i.h
@@ -11,8 +11,7 @@ class Quoter_Stock_Factory_i : public POA_Quoter::Stock_Factory {
 public:
   Quoter_Stock_Factory_i ();
 
-  Quoter::Stock_ptr get_stock (const char *symbol)
-    throw (Quoter::Invalid_Stock_Symbol);
+  Quoter::Stock_ptr get_stock (const char *symbol);
 
 private:
   Quoter_Stock_i rhat_;
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp
index 6149cb79c36..be99840deab 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.cpp
@@ -14,19 +14,19 @@ Quoter_Stock_i::Quoter_Stock_i (const char *symbol,
 }
 
 char *
-Quoter_Stock_i::symbol () throw (CORBA::SystemException)
+Quoter_Stock_i::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Quoter_Stock_i::full_name () throw (CORBA::SystemException)
+Quoter_Stock_i::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Quoter_Stock_i::price () throw (CORBA::SystemException)
+Quoter_Stock_i::price ()
 {
   return this->price_;
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h
index 61889a69b63..f47b1c8184d 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Stock_i.h
@@ -14,9 +14,9 @@ public:
                   const char *full_name,
                   CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index b0fe6bb1777..c0e06a422bf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -20,7 +20,6 @@ Locator_XMLHandler::startElement (const ACEXML_Char*,
                                   const ACEXML_Char*,
                                   const ACEXML_Char* qName,
                                   ACEXML_Attributes* attrs)
-                                    throw (ACEXML_SAXException)
 {
   ACE_ASSERT (qName != 0);
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0)
@@ -70,7 +69,6 @@ void
 Locator_XMLHandler::endElement (const ACEXML_Char*,
                                 const ACEXML_Char*,
                                 const ACEXML_Char* qName)
-                                  throw (ACEXML_SAXException)
 {
   ACE_ASSERT(qName != 0);
   if (ACE_OS::strcasecmp (qName, SERVER_INFO_TAG) == 0
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
index fc7890c4d92..e5065a587c4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
@@ -61,13 +61,11 @@ public:
   virtual void startElement (const ACEXML_Char* namespaceURI,
                              const ACEXML_Char* localName,
                              const ACEXML_Char* qName,
-                             ACEXML_Attributes* atts)
-                               throw (ACEXML_SAXException);
+                             ACEXML_Attributes* atts);
 
   virtual void endElement (const ACEXML_Char* namespaceURI,
                            const ACEXML_Char* localName,
-                           const ACEXML_Char* qName)
-                             throw (ACEXML_SAXException);
+                           const ACEXML_Char* qName);
 
  private:
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogACE_RB_Tree.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogACE_RB_Tree.h
index 9b54d353315..d54070c9d41 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogACE_RB_Tree.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogACE_RB_Tree.h
@@ -29,7 +29,6 @@ public:
 
   void
   insert (RecordIdType const& ri, RecordValueType const& rv)
-    throw (Duplicate)
   {
     if (map_.bind (ri, rv) != 0) throw Duplicate ();
   }
@@ -48,7 +47,7 @@ public:
 
 
   RecordValueType const&
-  lookup (RecordIdType const& ri) const throw (NotFound)
+  lookup (RecordIdType const& ri) const
   {
     Map_& m = const_cast<Map_&> (map_);
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogStdMap.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogStdMap.h
index 29a5ff2be65..c9b788cca23 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogStdMap.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/LogStdMap.h
@@ -25,7 +25,6 @@ public:
 
   void
   insert (RecordIdType const& ri, RecordValueType const& rv)
-    throw (Duplicate)
   {
     if (!map_.insert (std::make_pair (ri, rv)).second)
     {
@@ -41,7 +40,7 @@ public:
 
 
   RecordValueType const&
-  lookup (RecordIdType const& ri) const throw (NotFound)
+  lookup (RecordIdType const& ri) const
   {
     typename Map_::const_iterator i = map_.find (ri);
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp b/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
index fd6a8f70e77..5e23f3d9732 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.cpp
@@ -14,19 +14,19 @@ Stock::Stock (const char *symbol,
 }
 
 char *
-Stock::symbol () throw (CORBA::SystemException)
+Stock::symbol ()
 {
   return CORBA::string_dup (this->symbol_.c_str ());
 }
 
 char *
-Stock::full_name () throw (CORBA::SystemException)
+Stock::full_name ()
 {
   return CORBA::string_dup (this->full_name_.c_str ());
 }
 
 CORBA::Double
-Stock::price () throw (CORBA::SystemException)
+Stock::price ()
 {
   return this->price_;
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Stock.h b/TAO/orbsvcs/examples/LoadBalancing/Stock.h
index 3a902ed5261..1c9522acd68 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Stock.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/Stock.h
@@ -16,9 +16,9 @@ public:
          const char *full_name,
          CORBA::Double price);
 
-  char *symbol () throw (CORBA::SystemException);
-  char *full_name () throw (CORBA::SystemException);
-  CORBA::Double price () throw (CORBA::SystemException);
+  char *symbol ();
+  char *full_name ();
+  CORBA::Double price ();
 
 private:
 #if defined (HPUX) && (ACE_HAS_STANDARD_CPP_LIBRARY == 0)
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
index 54c4a2df81f..8953bb542ac 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.cpp
@@ -15,7 +15,6 @@ StockFactory::StockFactory (CORBA::ORB_ptr orb, int number)
 
 Test::Stock_ptr
 StockFactory::get_stock (const char *symbol)
-    throw (Test::Invalid_Stock_Symbol)
 {
   cout << "Server Number is " << number_ << endl;
   if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
diff --git a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
index 053fe79e808..4edf6fb9952 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/StockFactory.h
@@ -14,8 +14,7 @@ class StockFactory
 public:
   StockFactory (CORBA::ORB_ptr orb, int number);
 
-  Test::Stock_ptr get_stock (const char *symbol)
-    throw (Test::Invalid_Stock_Symbol);
+  Test::Stock_ptr get_stock (const char *symbol);
 
   virtual void shutdown (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index d1e8636e869..1fc5933c902 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -172,7 +172,6 @@ namespace TAO_Notify
     const ACEXML_Char*,
     const ACEXML_Char* name,
     ACEXML_Attributes* xml_attrs)
-        throw (ACEXML_SAXException)
   {
     ACE_ASSERT (name != 0);
     ACE_ASSERT (xml_attrs != 0);
@@ -209,7 +208,6 @@ namespace TAO_Notify
   XML_Loader::endElement (const ACEXML_Char*,
     const ACEXML_Char*,
     const ACEXML_Char* name)
-        throw (ACEXML_SAXException)
   {
     ACE_UNUSED_ARG (name);
     if (this->live_)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
index e2a1a967128..d98f1056fed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -58,13 +58,11 @@ public:
   virtual void startElement (const ACEXML_Char* namespaceURI,
     const ACEXML_Char* localName,
     const ACEXML_Char* qName,
-    ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL)
-      throw (ACEXML_SAXException);
+    ACEXML_Attributes* atts ACEXML_ENV_ARG_DECL);
 
   virtual void endElement (const ACEXML_Char*,
     const ACEXML_Char*,
-    const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED)
-      throw (ACEXML_SAXException);
+    const ACEXML_Char* name ACEXML_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// The name of the file from which data is read.
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
index d469544e251..3c62609cc72 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
@@ -3,7 +3,6 @@
 #include "Test_impl.h"
 
 void Server_impl::shutdown ()
-    throw (CORBA::SystemException)
 {
   this->orb_->shutdown (0);
 }
@@ -14,6 +13,5 @@ Server_impl::Server_impl (CORBA::ORB_ptr orb)
 }
 
 void Server_impl::method (CORBA::Object_ptr)
-    throw (CORBA::SystemException)
 {
 }
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
index 41c11b90668..5ecc2954d86 100644
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
@@ -9,8 +9,8 @@ class Server_impl   : public virtual POA_server
 {
 public:
   Server_impl (CORBA::ORB_ptr orb);
-  virtual void method (CORBA::Object_ptr object) throw (CORBA::SystemException);
-  virtual void shutdown () throw (CORBA::SystemException);
+  virtual void method (CORBA::Object_ptr object);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;    
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
index 3756ba12c54..5f2fc16368d 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.cpp
@@ -43,7 +43,6 @@ TestEventConsumer_i::ORB_task::svc ()
 
 void
 TestEventConsumer_i::push (const CORBA::Any & data)
-  throw (CORBA::SystemException, CosEventComm::Disconnected)
 {
   // Extract event data from the any.
   const char *eventData;
@@ -69,7 +68,6 @@ TestEventConsumer_i::push (const CORBA::Any & data)
 
 void
 TestEventConsumer_i::disconnect_push_consumer ()
- throw (CORBA::SystemException)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TestEventConsumer_i::disconnect_push_consumer()\n")));
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
index 2f97247ece0..1672e88303c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TestEventConsumer_i.h
@@ -15,10 +15,9 @@ public:
   TestEventConsumer_i (CORBA::ORB_ptr orb, bool hang);
 
   // Override operations from PushConsumer interface.
-  virtual void push (const CORBA::Any & data)
-    throw (CORBA::SystemException, CosEventComm::Disconnected);
+  virtual void push (const CORBA::Any & data);
 
-  virtual void disconnect_push_consumer () throw (CORBA::SystemException);
+  virtual void disconnect_push_consumer ();
 
   void activate ();
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 41cb931c8af..f6b8acd6dfe 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -20,7 +20,6 @@ EchoEventConsumer_i::EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit)
 
 // Implement the push() operation.
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
- throw(CORBA::SystemException)
 {
   // Loop through the events, looking for shutdown events.
   for (u_int i = 0; i < events.length (); ++i) {
@@ -48,7 +47,6 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 
 // Implement the disconnect_push_consumer() operation.
 void EchoEventConsumer_i::disconnect_push_consumer()
- throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
index f9f0f6168e5..288ce58931c 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -15,11 +15,9 @@ class EchoEventConsumer_i : public virtual POA_RtecEventComm::PushConsumer
     EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit);
 
     // Override operations from PushConsumer interface.
-    virtual void push(const RtecEventComm::EventSet& events)
-     throw(CORBA::SystemException);
+    virtual void push(const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_consumer();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index be8c74dbe2e..647b2545ef1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -15,7 +15,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
 
 // Override the disconnect_push_Supplier() operation.
 void EchoEventSupplier_i::disconnect_push_supplier()
-     throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
index 53f74aeea45..ab93a670215 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -14,8 +14,7 @@ class EchoEventSupplier_i : public virtual POA_RtecEventComm::PushSupplier
     // Constructor
     EchoEventSupplier_i(CORBA::ORB_ptr orb);
 
-    virtual void disconnect_push_supplier()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_supplier();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index dde747a17d9..a2a3234c1d3 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -25,12 +25,12 @@
 class TestSupplier
 : public POA_CosNotifyComm::StructuredPushSupplier
 {
-  virtual void disconnect_structured_push_supplier(void) throw (CORBA::SystemException) {
+  virtual void disconnect_structured_push_supplier(void)
+  {
   }
 
   virtual void subscription_change( const CosNotification::EventTypeSeq&,
-    const CosNotification::EventTypeSeq&)
-    throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
+                                    const CosNotification::EventTypeSeq&)
   {
   }
 };
@@ -38,16 +38,15 @@ class TestSupplier
 class TestConsumer
 : public POA_CosNotifyComm::StructuredPushConsumer
 {
-  virtual void disconnect_structured_push_consumer(void) throw (CORBA::SystemException) {
+  virtual void disconnect_structured_push_consumer(void)
+  {
   }
 
   virtual void offer_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&)
-    throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
   {
   }
 
   virtual void push_structured_event(const CosNotification::StructuredEvent&)
-    throw (CORBA::SystemException, CosEventComm::Disconnected)
   {
   }
 };
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index b6e0766e3e8..952b95f9e50 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -351,11 +351,9 @@ TAO_POA_Manager::check_state (void)
 
       // Since there is no queuing in TAO, we immediately raise a
       // TRANSIENT exception.
-      throw ( ::CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_HOLDING,
-          1),
-        CORBA::COMPLETED_NO));
+      throw ::CORBA::TRANSIENT (
+                CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1),
+                CORBA::COMPLETED_NO);
     }
 
   if (state_ == PortableServer::POAManager::INACTIVE)
@@ -371,11 +369,9 @@ TAO_POA_Manager::check_state (void)
       // co-resident in the same process, the ORB could raise the
       // OBJ_ADAPTER system exception, with standard minor code 1, to
       // indicate that the object implementation is unavailable.
-      throw ( ::CORBA::OBJ_ADAPTER (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_INACTIVE,
-          1),
-        CORBA::COMPLETED_NO));
+      throw ::CORBA::OBJ_ADAPTER (
+                CORBA::SystemException::_tao_minor_code (TAO_POA_INACTIVE, 1),
+                CORBA::COMPLETED_NO);
     }
 }
 
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index 1f1432a69cc..005213d0e65 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -815,8 +815,8 @@ namespace TAO
       // same then the ORB shall return SUCCESS.
       if (!priorities_match)
         {
-          throw ( ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
-                                          CORBA::COMPLETED_NO));
+          throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
+                                        CORBA::COMPLETED_NO);
         }
 
       bool const may_activate =