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

16 files changed, 67 insertions, 310 deletions

diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
index f5659723d0e..83ecc32166d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
@@ -25,7 +25,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -35,7 +34,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -44,7 +42,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -53,7 +50,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -72,16 +68,13 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
-  ++this->count_op5_;
-  ACE_THROW_SPEC (FooException());
+  ++this->count_op5_;;
 }
 
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index 2829a446f59..b7b33f0638e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -14,23 +14,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index a6773b691ee..461047110cc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -23,7 +23,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -33,7 +32,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -42,7 +40,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -51,7 +48,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -70,16 +66,13 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
-  ++this->count_op5_;
-  ACE_THROW_SPEC (FooException());
+  ++this->count_op5_;;
 }
 
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index e81153d9dc6..695b1219e49 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -16,23 +16,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
index bbc9b5fa385..426b75936a0 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
@@ -17,14 +17,12 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
 }
 
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->value_ = value;
 }
@@ -32,7 +30,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -41,7 +38,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->value_ = value;
 }
@@ -49,7 +45,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   throw FooException();
 }
@@ -57,7 +52,6 @@ Foo_i::op5(void)
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index 7bd860e3640..eb1ca654c5a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -12,23 +12,17 @@ class Foo_i : public virtual POA_Foo
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
   private:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
index 61712fb4fae..9c328747bfc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
@@ -15,9 +15,6 @@ Callback_i::~Callback_i ()
 void
 Callback_i::test_method (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index d9e41b60de4..18f8b0f6631 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -14,10 +14,7 @@ class Callback_i : public virtual POA_Callback
     virtual ~Callback_i();
 
     virtual void test_method (
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 
 };
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
index 9ae1781b873..56d95507f92 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
@@ -22,7 +22,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -32,7 +31,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -41,7 +39,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -50,7 +47,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -69,14 +65,12 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n"));
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n"));
   unsigned newcount = ++this->count_op5_;
   ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Counter is now %d.\n", newcount));
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));
-  ACE_THROW_SPEC (FooException());
+  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));;
 }
 
 
@@ -85,9 +79,6 @@ Foo_i::op6 (
   const char * user_name,
   char *& message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_CString str(message);
   str += user_name;
@@ -101,9 +92,6 @@ void
 Foo_i::test_unbounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
                        ACE_TEXT("got unbounded string %s\n"),
@@ -115,9 +103,6 @@ void
 Foo_i::test_bounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
                        ACE_TEXT("got bounded string %s\n"),
@@ -129,9 +114,6 @@ void
 Foo_i::test_fixed_array_arg (
   const ::Fixed_Array message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   for (CORBA::ULong i = 0; i < 20; i++)
     {
@@ -146,9 +128,6 @@ void
 Foo_i::test_bounded_var_size_arg (
   const ::Bounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -160,9 +139,6 @@ void
 Foo_i::test_unbounded_var_size_arg (
   const ::Unbounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -174,9 +150,6 @@ void
 Foo_i::test_fixed_size_arg (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -187,9 +160,6 @@ void
 Foo_i::test_fixed_size_arg_two_way (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -200,9 +170,6 @@ void
 Foo_i::test_var_array_arg (
   const ::Var_Array messages
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
                        ACE_TEXT(" %s \n"), messages[0].in ()));
@@ -217,9 +184,6 @@ void
 Foo_i::test_special_basic_arg (
   ::CORBA::Boolean value
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
                        ACE_TEXT(" got special basic arg: %d \n"), value));
@@ -230,9 +194,6 @@ void
 Foo_i::test_objref_arg (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
@@ -244,9 +205,6 @@ void
 Foo_i::callback_object (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
 }
@@ -254,9 +212,6 @@ ACE_THROW_SPEC ((
 void
 Foo_i::test_callback (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException, FooException
-))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     {
@@ -271,7 +226,6 @@ ACE_THROW_SPEC ((
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_clients = 2;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index bb209487d87..bda78300650 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -17,114 +17,69 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_var_array_arg (
         const ::Var_Array messages
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void callback_object (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_callback (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException, FooException
-      ));
+      );
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
index 61712fb4fae..9c328747bfc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
@@ -15,9 +15,6 @@ Callback_i::~Callback_i ()
 void
 Callback_i::test_method (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index 016ff3fb464..d45d948fb53 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -14,10 +14,7 @@ class Callback_i : public virtual POA_Callback
     virtual ~Callback_i();
 
     virtual void test_method (
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+    );
 };
 
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
index de8c5c5b9e8..e749ebdab9f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
@@ -24,7 +24,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -34,7 +33,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -43,7 +41,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
 
@@ -58,7 +55,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -77,7 +73,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
   throw FooException();
@@ -89,9 +84,6 @@ Foo_i::op6 (
   const char * user_name,
   char *& message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_CString str(message);
   str += user_name;
@@ -105,9 +97,6 @@ void
 Foo_i::test_unbounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
                        ACE_TEXT("got unbounded string %s\n"),
@@ -119,9 +108,6 @@ void
 Foo_i::test_bounded_string_arg (
   const char * message
 )
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
                        ACE_TEXT("got bounded string %s\n"),
@@ -133,9 +119,6 @@ void
 Foo_i::test_fixed_array_arg (
   const ::Fixed_Array message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   for (CORBA::ULong i = 0; i < 20; i++)
     {
@@ -150,9 +133,6 @@ void
 Foo_i::test_bounded_var_size_arg (
   const ::Bounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -164,9 +144,6 @@ void
 Foo_i::test_unbounded_var_size_arg (
   const ::Unbounded_Var_Size & message
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ")
                        ACE_TEXT("got var array chars %s\n"),
@@ -178,9 +155,6 @@ void
 Foo_i::test_fixed_size_arg (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -191,9 +165,6 @@ void
 Foo_i::test_fixed_size_arg_two_way (
   const ::TimeOfDay & t
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ")
                        ACE_TEXT("got timeofday %d:%d:%d\n"),
@@ -204,9 +175,6 @@ void
 Foo_i::test_var_array_arg (
   const ::Var_Array messages
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
                        ACE_TEXT(" %s \n"), messages[0].in ()));
@@ -221,9 +189,6 @@ void
 Foo_i::test_special_basic_arg (
   ::CORBA::Boolean value
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
                        ACE_TEXT(" got special basic arg: %d \n"), value));
@@ -234,9 +199,6 @@ void
 Foo_i::test_objref_arg (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
   ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
@@ -248,9 +210,6 @@ void
 Foo_i::callback_object (
   ::Callback_ptr cb
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   this->callback_ = Callback::_duplicate (cb);
 }
@@ -258,9 +217,6 @@ ACE_THROW_SPEC ((
 void
 Foo_i::test_callback (
 )
-ACE_THROW_SPEC ((
-  CORBA::SystemException, FooException
-))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     {
@@ -275,7 +231,6 @@ ACE_THROW_SPEC ((
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   this->mgr_->client_done();
 }
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index 9b0db58c201..5173fa40f6e 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -16,114 +16,69 @@ class Foo_i : public virtual POA_Foo
     Foo_i(const char* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
     virtual CORBA::Boolean op6 (
         const char * user_name,
         char *& message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_string_arg (
         const char * message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_array_arg (
         const ::Fixed_Array message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_var_array_arg (
         const ::Var_Array messages
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_bounded_var_size_arg (
         const ::Bounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_unbounded_var_size_arg (
         const ::Unbounded_Var_Size & message
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_fixed_size_arg_two_way (
         const ::TimeOfDay & t
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_special_basic_arg (
         ::CORBA::Boolean value
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_objref_arg (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void callback_object (
         ::Callback_ptr cb
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     virtual void test_callback (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException, FooException
-      ));
+      );
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
     void active (bool flag);
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
index f2044eb4e8b..336c96d8b53 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
@@ -26,7 +26,6 @@ Foo_i::~Foo_i()
 
 void
 Foo_i::op1(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op1_;
   // Sleep for 10 milliseconds (10,000 microseconds)
@@ -36,7 +35,6 @@ Foo_i::op1(void)
 
 void
 Foo_i::op2(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op2_;
   this->value_ = value;
@@ -45,7 +43,6 @@ Foo_i::op2(CORBA::Long value)
 
 CORBA::Long
 Foo_i::op3(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op3_;
   return this->value_;
@@ -54,7 +51,6 @@ Foo_i::op3(void)
 
 void
 Foo_i::op4(CORBA::Long value)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   ++this->count_op4_;
   this->value_ = value;
@@ -73,7 +69,6 @@ Foo_i::op4(CORBA::Long value)
 
 void
 Foo_i::op5(void)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
 {
   ++this->count_op5_;
   throw FooException();
@@ -82,7 +77,6 @@ Foo_i::op5(void)
 
 void
 Foo_i::done(void)
-  ACE_THROW_SPEC((CORBA::SystemException))
 {
   unsigned num_left = --this->num_clients_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
index 2858ec966ad..a5bf36c4040 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
@@ -12,23 +12,17 @@ class Foo_i
     Foo_i(unsigned num_clients);
     virtual ~Foo_i();
 
-    virtual void op1(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op1(void);
 
-    virtual void op2(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op2(CORBA::Long value);
 
-    virtual CORBA::Long op3(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual CORBA::Long op3(void);
 
-    virtual void op4(CORBA::Long value)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void op4(CORBA::Long value);
 
-    virtual void op5(void)
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
+    virtual void op5(void);
 
-    virtual void done(void)
-      ACE_THROW_SPEC((CORBA::SystemException));
+    virtual void done(void);
 
 
   private: