1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp
index be9c69c55d8..b98f379155f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp
@@ -67,7 +67,7 @@ TAO_SSLIOP_Vault::~TAO_SSLIOP_Vault (void)
 Security::AuthenticationMethodList *
 TAO_SSLIOP_Vault::get_supported_authen_methods (
     const char * /* mechanism */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -79,7 +79,7 @@ TAO_SSLIOP_Vault::get_supported_authen_methods (
 }
 
 Security::OIDList *
-TAO_SSLIOP_Vault::supported_mech_oids (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SSLIOP_Vault::supported_mech_oids (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -100,7 +100,7 @@ TAO_SSLIOP_Vault::acquire_credentials (
     SecurityLevel2::Credentials_out creds,
     CORBA::Any_out /* continuation_data */,
     CORBA::Any_out /* auth_specific_data */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if we support the given mechanism.
@@ -147,7 +147,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition (
     SecurityLevel2::Credentials_ptr /* creds */,
     CORBA::Any_out /* continuation_data */,
     CORBA::Any_out /* auth_specific_data */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -161,7 +161,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition (
 IOP::TaggedComponentList *
 TAO_SSLIOP_Vault::create_ior_components (
     SecurityLevel2::Credentials_ptr /* creds_list */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -184,7 +184,7 @@ TAO_SSLIOP_Vault::init_security_context (
     const Security::ChannelBindings & /* chan_binding */,
     Security::OpaqueBuffer_out /* security_token */,
     SecurityReplaceable::ClientSecurityContext_out /* security_context */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -201,7 +201,7 @@ TAO_SSLIOP_Vault::accept_security_context (
     const Security::ChannelBindings & /* chan_bindings */,
     const Security::Opaque & /* in_token */,
     Security::Opaque_out /* out_token */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -214,7 +214,7 @@ TAO_SSLIOP_Vault::accept_security_context (
 
 Security::MechandOptionsList *
 TAO_SSLIOP_Vault::get_supported_mechs (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (