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

2 files changed, 5 insertions, 15 deletions

diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp
index 4d91591ca64..2362176f053 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp
@@ -16,21 +16,18 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$")
 
 void
 Hello::system_exception_test (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::INTERNAL ();
 }
 
 void
 Hello::user_exception_expected (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A))
 {
   throw ::Test::Hello::A ();
 }
 
 void
 Hello::user_exception_not_expected (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A))
 {
   this->throw_internal_b ();
 }
@@ -43,7 +40,6 @@ Hello::throw_internal_b (void)
 
 char *
 Hello::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Upcall in process ..\n"));
@@ -86,7 +82,6 @@ Hello::get_string (void)
 
 void
 Hello::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index bb4f2265ec4..3fef01855b0 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -25,20 +25,15 @@ public:
          ACE_thread_t thr_id);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void system_exception_test (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void system_exception_test (void);
 
-  virtual void user_exception_expected (void)
-      ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A));
+  virtual void user_exception_expected (void);
 
-  virtual void user_exception_not_expected (void)
-      ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A));
+  virtual void user_exception_not_expected (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
 private:
   void throw_internal_b (void);