Mon Feb 12 13:57:06 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 7 insertions, 49 deletions

diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
index 3aca5735ae0..3c21751ba6d 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp
@@ -46,9 +46,6 @@ namespace CIDL_Receiver_Impl
   void
   Receiver_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
     Receiver_Context::_narrow (
@@ -62,45 +59,30 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Receiver_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
@@ -129,9 +111,6 @@ namespace CIDL_Receiver_Impl
 
   ::Components::EnterpriseComponent_ptr
   ReceiverHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
index a90c6941de7..b76d69f4f23 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver_exec.h
+++ b/CIAO/tests/Minimum/Receiver/Receiver_exec.h
@@ -52,40 +52,22 @@ namespace CIDL_Receiver_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     Receiver_Context *context_;
@@ -110,10 +92,7 @@ namespace CIDL_Receiver_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr