1 files changed, 14 insertions, 31 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 418b6d60600..6e5d711b3a7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -16,113 +16,96 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
 
 SecurityLevel3::CredentialsType
 TAO::SSLIOP::TargetCredentials::creds_type (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return SecurityLevel3::CT_TargetCredentials;
 }
 
 char *
 TAO::SSLIOP::TargetCredentials::context_id (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
 TAO::SSLIOP::TargetCredentials::client_principal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::StatementList *
 TAO::SSLIOP::TargetCredentials::client_supporting_statements ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ResourceNameList *
 TAO::SSLIOP::TargetCredentials::client_restricted_resources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::Principal *
 TAO::SSLIOP::TargetCredentials::target_principal (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::StatementList *
 TAO::SSLIOP::TargetCredentials::target_supporting_statements ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::ResourceNameList *
 TAO::SSLIOP::TargetCredentials::target_restricted_resources ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::TargetCredentials::parent_credentials (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    SecurityLevel3::OwnCredentials::_nil ());
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::client_authentication (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::target_authentication (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::confidentiality (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::integrity (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::target_embodied (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 CORBA::Boolean
 TAO::SSLIOP::TargetCredentials::target_endorsed (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+  throw CORBA::NO_IMPLEMENT ();
 }
 
 void
 TAO::SSLIOP::TargetCredentials::release (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   throw CORBA::NO_IMPLEMENT ();
 }