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

5 files changed, 6 insertions, 19 deletions

diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index 5d96a31ec01..80580ae7033 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -11,14 +11,12 @@ Crashed_Callback::Crashed_Callback (void)
 
 CORBA::Boolean
 Crashed_Callback::are_you_there (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
 Crashed_Callback::crash_now_please (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Crashed_Callback - crashing application \n"));
@@ -35,6 +33,5 @@ Crashed_Callback::crash_now_please (void)
 
 void
 Crashed_Callback::test_oneway (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index 3efa13bd774..e8a17b21832 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -17,14 +17,11 @@ public:
   Crashed_Callback (void);
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean are_you_there (void);
 
-  virtual void crash_now_please (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void crash_now_please (void);
 
-  virtual void test_oneway (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_oneway (void);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index fb46b04e3df..f628c6296ee 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): taoclient, portableserver, messaging {
   after += *idl
-  after += *Server
   Source_Files {
     Crashed_Callback.cpp
     client.cpp
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index d6a33d93d7a..04fb261c1b2 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -22,7 +22,6 @@ Service::dump_results (void)
 
 void
 Service::run_test (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int pre_crash_exceptions =
     this->call_are_you_there (callback);
@@ -65,7 +64,6 @@ Service::run_test (Test::Crashed_Callback_ptr callback)
 
 int
 Service::call_are_you_there (Test::Crashed_Callback_ptr callback)
-  ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
   const int iterations = 50;
@@ -87,7 +85,6 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback)
 
 int
 Service::call_test_oneway (Test::Crashed_Callback_ptr callback)
-  ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
   const int iterations = 50;
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index b0cdc9b35ec..99d430525f1 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -23,23 +23,20 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void run_test (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void run_test (Test::Crashed_Callback_ptr callback);
 
 private:
   /// Call the are_you_there callback multiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_are_you_there (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC (());
+  int call_are_you_there (Test::Crashed_Callback_ptr callback);
 
   /// Call the test_oneway method mutiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_test_oneway (Test::Crashed_Callback_ptr callback)
-    ACE_THROW_SPEC (());
+  int call_test_oneway (Test::Crashed_Callback_ptr callback);
 
 private:
   /// Count the number of tests executed