1 files changed, 20 insertions, 29 deletions
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
index 005b183df40..11f1fc27962 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
@@ -110,7 +110,7 @@ Impl::TSEC_Session_impl::hash
 CORBA::Long
 Impl::TSEC_Session_impl::getIdent
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), -1 );
 
@@ -125,7 +125,7 @@ Impl::TSEC_Session_impl::getIdent
 CORBA::Boolean
 Impl::TSEC_Session_impl::isInUse
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), FALSE );
   return _isInUse;
@@ -183,7 +183,7 @@ CORBA::Object_ptr
 Impl::TSEC_CheckPoint_exec_i::getObjRef
 (
   PortableServer::Servant Servant
-) ACE_THROW_SPEC( (CORBA::SystemException ) )
+)
 {
   return this->_p_sessionContainer->get_objref( Servant );
 }
@@ -196,7 +196,7 @@ Impl::TSEC_CheckPoint_exec_i::getObjRef
 int
 Impl::TSEC_CheckPoint_exec_i::init
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   ACE_DEBUG ((LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::init\n"));
 
@@ -219,7 +219,7 @@ CORBA::Object_ptr
 Impl::TSEC_CheckPoint_exec_i::installServant
 (
   PortableServer::Servant Servant
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   assert( this->_p_sessionContainer );
 
@@ -236,7 +236,7 @@ void
 Impl::TSEC_CheckPoint_exec_i::uninstallServant
 (
   CORBA::Object_ptr ObjRef
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   assert( this->_p_sessionContainer );
 
@@ -251,7 +251,7 @@ Impl::TSEC_CheckPoint_exec_i::uninstallServant
 ENW::TSession_ptr
 Impl::TSEC_CheckPoint_exec_i::createSession
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   static long cnt = 0L;
 
@@ -279,7 +279,7 @@ Impl::TSEC_CheckPoint_exec_i::createSession
 Impl::TSEC_CheckPoint_exec_i::destroySession
 (
   ENW::TSession_ptr Session
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...\n" ) );
 
@@ -303,8 +303,7 @@ ENW::TSession_ptr
 Impl::TSEC_CheckPoint_exec_i::acquireSession
 (
   CORBA::Long Ident
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    ENW::EUnknownIdent ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::acquireSession...\n" ) );
 
@@ -355,8 +354,7 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession
 (
   CORBA::Long Ident,
   ENW::TSession_ptr Session
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    ENW::EUnknownSession ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...\n" ) );
 
@@ -407,7 +405,7 @@ Impl::TSEC_CheckPoint_exec_i::releaseSession
 ENW::CCM_ISessionService_ptr
 Impl::TSEC_CheckPoint_exec_i::get_sessionService
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   return ENW::CCM_ISessionService::_duplicate( this );
 }
@@ -421,8 +419,7 @@ void
 Impl::TSEC_CheckPoint_exec_i::set_session_context
 (
   Components::SessionContext_ptr Ctx
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG,
                "Impl::TSEC_CheckPoint_exec_i::set_session_context\n" ) );
@@ -461,7 +458,7 @@ void
 Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
 (
   ENW::ET_LifeToken* /* Event */
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
+)
 {
   _awaitingLifeToken = false;
 }
@@ -474,8 +471,7 @@ Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
 void
 Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_preactivate\n" ) );
 }
@@ -488,8 +484,7 @@ Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_activate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_activate\n" ) );
 
@@ -517,8 +512,7 @@ Impl::TSEC_CheckPoint_exec_i::ccm_activate
 void
 Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_postactivate\n" ) );
 }
@@ -531,8 +525,7 @@ Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_passivate
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_passivate\n" ) );
   _isActivated = false;
@@ -546,8 +539,7 @@ Impl::TSEC_CheckPoint_exec_i::ccm_passivate
 void
 Impl::TSEC_CheckPoint_exec_i::ccm_remove
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
   ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_remove\n" ) );
   _isActivated = false;
@@ -580,7 +572,7 @@ Impl::TSEC_CheckPointHome_exec_i::~TSEC_CheckPointHome_exec_i()
 Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
 (
   const char* Version
-  ) ACE_THROW_SPEC( ( CORBA::SystemException ))
+  )
 {
   return new Impl::TSEC_CheckPoint_exec_i( Version );
 }
@@ -593,8 +585,7 @@ Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
 ::Components::EnterpriseComponent_ptr
 Impl::TSEC_CheckPointHome_exec_i::create
 (
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
+)
 {
 
   return new Impl::TSEC_CheckPoint_exec_i();