diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP')
22 files changed, 180 insertions, 180 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 5742ba7d84f..c8fa5d4df4a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -119,7 +119,7 @@ int TAO_IIOP_SSL_Connector::connect ( TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index e4e999675f5..634cedd3a73 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -53,7 +53,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index a556252a79c..0f5907519f2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -122,7 +122,7 @@ TAO_SSLIOP_Connector::close (void) int TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -149,12 +149,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // policy for the current object. CORBA::Policy_var policy = invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::EstablishTrustPolicy_var trust_policy = SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We use a pointer and temporary to make it obvious to determine @@ -164,7 +164,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, Security::EstablishTrust trust = { 0 , 0 }; if (!CORBA::is_nil (trust_policy.in ())) { - trust = trust_policy->trust (TAO_ENV_SINGLE_ARG_PARAMETER); + trust = trust_policy->trust (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -197,12 +197,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // Check if the user overrode the default Quality-of-Protection for // the current object. policy = invocation->stub ()->get_policy (Security::SecQOPPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::QOPPolicy_var qop_policy = SecurityLevel2::QOPPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Temporary variable used to avoid overwriting the default value @@ -211,7 +211,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, if (!CORBA::is_nil (qop_policy.in ())) { - qop = qop_policy->qop (TAO_ENV_SINGLE_ARG_PARAMETER); + qop = qop_policy->qop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -239,7 +239,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, { return this->iiop_connect (ssl_endpoint, invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return this->ssliop_connect (ssl_endpoint, @@ -247,7 +247,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, trust, invocation, desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -270,7 +270,7 @@ TAO_SSLIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -294,7 +294,7 @@ TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) int TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component (); @@ -329,7 +329,7 @@ TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, // Note that the IIOP-only transport descriptor is used! return this->TAO_IIOP_SSL_Connector::connect (invocation, &iiop_desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -338,7 +338,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, const Security::EstablishTrust &trust, TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Transport *&transport = invocation->transport (); ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -486,7 +486,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_SSLIOP_Credentials_var credentials = this->retrieve_credentials (invocation->stub (), svc_handler->peer ().ssl () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); svc_handler = safe_handler.release (); @@ -569,18 +569,18 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_SSLIOP_Credentials * TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, SSL *ssl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if the user overrode the default invocation credentials. CORBA::Policy_var policy = stub->get_policy (Security::SecInvocationCredentialsPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); SecurityLevel2::InvocationCredentialsPolicy_var creds_policy = SecurityLevel2::InvocationCredentialsPolicy::_narrow ( policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); TAO_SSLIOP_Credentials_var ssliop_credentials; @@ -590,7 +590,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, if (!CORBA::is_nil (creds_policy.in ())) { SecurityLevel2::CredentialsList_var creds_list = - creds_policy->creds (TAO_ENV_SINGLE_ARG_PARAMETER); + creds_policy->creds (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); if (creds_list->length () > 0) @@ -603,7 +603,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, ssliop_credentials = TAO_SSLIOP_Credentials::_narrow (credentials - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); if (!CORBA::is_nil (ssliop_credentials.in ())) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 2842d3a062f..3d6175aa057 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -60,7 +60,7 @@ public: virtual int close (void); virtual int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual TAO_Profile *create_profile (TAO_InputCDR& cdr); //@} @@ -71,7 +71,7 @@ protected: * * Please check the documentation in Pluggable.h. */ - virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// IIOP-specific connection establishment. /** @@ -79,7 +79,7 @@ protected: */ int iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// SSLIOP-specific connection establishment. int ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, @@ -87,14 +87,14 @@ protected: const Security::EstablishTrust &trust, TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Retrieve SSLIOP credentials from the policy overrides list and /// set up the underlying SSL connection to use the X.509 /// certificates stored within them. TAO_SSLIOP_Credentials * retrieve_credentials (TAO_Stub *stub, SSL *ssl - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 62015c21e9a..07ed18f146f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -40,7 +40,7 @@ TAO_SSLIOP_Credentials::~TAO_SSLIOP_Credentials (void) } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Credentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_Credentials *c = 0; @@ -58,20 +58,20 @@ TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_SSLIOP_Credentials::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::InvocationCredentialsType -TAO_SSLIOP_Credentials::credentials_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::credentials_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecOwnCredentials; } Security::AuthenticationStatus -TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::authentication_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Is the following statement correct? @@ -83,7 +83,7 @@ TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::mechanism (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo Is the following correct? @@ -97,7 +97,7 @@ TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) Security::AssociationOptions TAO_SSLIOP_Credentials::accepting_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->accepting_options_supported_; @@ -106,7 +106,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported ( void TAO_SSLIOP_Credentials::accepting_options_supported ( Security::AssociationOptions accepting_options_supported - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo Verify that the given accepting options are valid @@ -130,7 +130,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported ( Security::AssociationOptions TAO_SSLIOP_Credentials::accepting_options_required ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->accepting_options_required_; @@ -139,7 +139,7 @@ TAO_SSLIOP_Credentials::accepting_options_required ( void TAO_SSLIOP_Credentials::accepting_options_required ( Security::AssociationOptions accepting_options_required - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // "accepting_options_required" should not have "more" capability @@ -158,7 +158,7 @@ TAO_SSLIOP_Credentials::accepting_options_required ( Security::AssociationOptions TAO_SSLIOP_Credentials::invocation_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->invocation_options_supported_; @@ -167,7 +167,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported ( void TAO_SSLIOP_Credentials::invocation_options_supported ( Security::AssociationOptions invocation_options_supported - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if ((invocation_options_supported & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS) @@ -183,7 +183,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported ( Security::AssociationOptions TAO_SSLIOP_Credentials::invocation_options_required ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->invocation_options_required_; @@ -192,7 +192,7 @@ TAO_SSLIOP_Credentials::invocation_options_required ( void TAO_SSLIOP_Credentials::invocation_options_required ( Security::AssociationOptions invocation_options_required - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if ((invocation_options_required & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS) @@ -210,7 +210,7 @@ CORBA::Boolean TAO_SSLIOP_Credentials::get_security_feature ( Security::CommunicationDirection /* direction */, Security::SecurityFeature /* feature */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -225,7 +225,7 @@ CORBA::Boolean TAO_SSLIOP_Credentials::set_attributes ( const Security::AttributeList & /* requested_attributes */, Security::AttributeList_out /* actual_attributes */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -239,7 +239,7 @@ TAO_SSLIOP_Credentials::set_attributes ( Security::AttributeList * TAO_SSLIOP_Credentials::get_attributes ( const Security::AttributeTypeList & /* attributes */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -253,7 +253,7 @@ TAO_SSLIOP_Credentials::get_attributes ( CORBA::Boolean TAO_SSLIOP_Credentials::is_valid ( Security::UtcT_out expiry_time - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { X509 *x = this->x509_.in (); @@ -301,7 +301,7 @@ TAO_SSLIOP_Credentials::is_valid ( CORBA::Boolean TAO_SSLIOP_Credentials::refresh (const CORBA::Any & /* refresh_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Until it is clear the code below is correct, throw a @@ -416,15 +416,15 @@ TAO_SSLIOP_Credentials::hash (void) const TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_Credentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Credentials::_nil (); @@ -512,10 +512,10 @@ tao_TAO_SSLIOP_Credentials_nil ( TAO_SSLIOP_Credentials_ptr tao_TAO_SSLIOP_Credentials_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -637,10 +637,10 @@ TAO_SSLIOP_Credentials_var::tao_nil (void) ::TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index b3ec3619e01..68f70b49f06 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -58,7 +58,7 @@ public: static TAO_SSLIOP_Credentials_ptr tao_nil (void); static TAO_SSLIOP_Credentials_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -109,11 +109,11 @@ public: /// Return a duplicate (specifically a deep copy) of this credential /// object. virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the invocation credentials type this object is. @@ -133,79 +133,79 @@ public: * (i.e. Security::SecTargetCredentials) is returned. */ virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AuthenticationStatus authentication_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * mechanism ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions accepting_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void accepting_options_supported ( Security::AssociationOptions accepting_options_supported - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions accepting_options_required ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void accepting_options_required ( Security::AssociationOptions accepting_options_required - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions invocation_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invocation_options_supported ( Security::AssociationOptions invocation_options_supported - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions invocation_options_required ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invocation_options_required ( Security::AssociationOptions invocation_options_required - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean get_security_feature ( Security::CommunicationDirection direction, Security::SecurityFeature feature - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_attributes ( const Security::AttributeList & requested_attributes, Security::AttributeList_out actual_attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Verify that this credential is still valid. virtual CORBA::Boolean is_valid ( Security::UtcT_out expiry_time - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean refresh ( const CORBA::Any & refresh_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ @@ -244,12 +244,12 @@ public: static TAO_SSLIOP_Credentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_Credentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_Credentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 896c4041c50..b7289fb5256 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -29,7 +29,7 @@ TAO_SSLIOP_Current::~TAO_SSLIOP_Current (void) SSLIOP::ASN_1_Cert * TAO_SSLIOP_Current::get_peer_certificate ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)) { @@ -63,7 +63,7 @@ TAO_SSLIOP_Current::get_peer_certificate ( SSLIOP::SSL_Cert * TAO_SSLIOP_Current::get_peer_certificate_chain ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)) { @@ -96,7 +96,7 @@ TAO_SSLIOP_Current::get_peer_certificate_chain ( } CORBA::Boolean -TAO_SSLIOP_Current::no_context (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Current::no_context (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (this->implementation () == 0 ? 1 : 0); @@ -132,15 +132,15 @@ TAO_SSLIOP_Current::teardown (TAO_SSLIOP_Current_Impl *prev_impl, TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return TAO_SSLIOP_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Current::_nil (); @@ -247,10 +247,10 @@ tao_TAO_SSLIOP_Current_nil ( TAO_SSLIOP_Current_ptr tao_TAO_SSLIOP_Current_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -375,10 +375,10 @@ TAO_SSLIOP_Current_var::tao_nil (void) ::TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 7c27bf20d1d..a3798369bac 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -63,7 +63,7 @@ public: /// Return the peer certificate associated with the current /// request. virtual SSLIOP::ASN_1_Cert * get_peer_certificate ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)); @@ -75,7 +75,7 @@ public: /// certficate. However, the certificate chain on the server side /// does NOT contain the peer (client) certificate. virtual SSLIOP::SSL_Cert * get_peer_certificate_chain ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)); @@ -84,7 +84,7 @@ public: /// means of determining whether or not SSL session state is /// available. virtual CORBA::Boolean no_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the TSS slot ID assigned to this object. @@ -118,12 +118,12 @@ public: static TAO_SSLIOP_Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_SSLIOP_Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_SSLIOP_Current_ptr _nil (void) @@ -197,7 +197,7 @@ public: static TAO_SSLIOP_Current_ptr tao_nil (void); static TAO_SSLIOP_Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index e65c3d59886..2264ace46b3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -23,7 +23,7 @@ TAO_SSLIOP_Current_Impl::~TAO_SSLIOP_Current_Impl (void) Security::AttributeList * TAO_SSLIOP_Current_Impl::get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong len = attributes.length (); @@ -126,7 +126,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( SecurityLevel2::ReceivedCredentials_ptr TAO_SSLIOP_Current_Impl::received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_X509_var cert = ::SSL_get_peer_certificate (this->ssl_); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index db6de036f3d..29d834ea4ef 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -50,13 +50,13 @@ public: /// SecurityLevel1::Current::get_attributes() method. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// SSLIOP-specific version of the /// SecurityLevel2::Current::received_credentials() method. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the SSL peer certificate associated with the diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 0900543150e..a2778ea49eb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -212,7 +212,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc, int TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // @todo: This hard-coding should be fixed once SECIOP is @@ -231,7 +231,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) PortableInterceptor::ORBInitializer_var initializer = tmp; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the SSLIOP ORB initializer. @@ -249,7 +249,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) initializer = tmp; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index f708da783fa..e10055a6dab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -25,7 +25,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor:: char * TAO_SSLIOP_Server_Invocation_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_SSLIOP_Server_Invocation_Interceptor"); @@ -33,7 +33,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::name ( void TAO_SSLIOP_Server_Invocation_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,7 +42,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::destroy ( void TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -56,7 +56,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( // accept or reject requests on a per-object basis // instead on a per-endpoint basis. CORBA::Boolean no_ssl = - this->ssliop_current_->no_context (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (no_ssl && this->qop_ != Security::SecQOPNoProtection) @@ -70,7 +70,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( // exception. Otherwise, it will return a DER encoded X509 // certificate. SSLIOP::ASN_1_Cert_var cert = - this->ssliop_current_->get_peer_certificate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ssliop_current_->get_peer_certificate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // @@ The following debugging code works but I don't think that @@ -128,7 +128,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( void TAO_SSLIOP_Server_Invocation_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -137,7 +137,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -145,7 +145,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_reply ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -154,7 +154,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_exception ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index e71ec09950f..433244598e1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -61,38 +61,38 @@ public: * PortableInterceptor::ServerRequestInterceptor interface. */ //@{ - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index a4bf5a6112a..129bc080131 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -27,12 +27,12 @@ TAO_SSLIOP_ORBInitializer::TAO_SSLIOP_ORBInitializer (Security::QOP qop) void TAO_SSLIOP_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -63,14 +63,14 @@ TAO_SSLIOP_ORBInitializer::pre_init ( // Register the SSLIOP::Current object reference with the ORB. info->register_initial_reference ("SSLIOPCurrent", ssliop_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_SSLIOP_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Note we do not store the SSLIOP::Current as a class member since @@ -84,11 +84,11 @@ TAO_SSLIOP_ORBInitializer::post_init ( // pre_init() method. CORBA::Object_var obj = - info->resolve_initial_references ("SSLIOPCurrent" TAO_ENV_ARG_PARAMETER); + info->resolve_initial_references ("SSLIOPCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; SSLIOP::Current_var ssliop_current = - SSLIOP::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (ssliop_current.in ())) @@ -99,7 +99,7 @@ TAO_SSLIOP_ORBInitializer::post_init ( if (tao_current != 0) { - size_t slot = this->get_tss_slot_id (info TAO_ENV_ARG_PARAMETER); + size_t slot = this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; tao_current->tss_slot (slot); @@ -128,27 +128,27 @@ TAO_SSLIOP_ORBInitializer::post_init ( // Register the SSLIOP secure invocation server request interceptor // with the ORB. info->add_server_request_interceptor (si_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Register the SSLIOP-specific vault with the // PrincipalAuthenticator. obj = info->resolve_initial_references ("SecurityManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityLevel2::SecurityManager_var manager = SecurityLevel2::SecurityManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityLevel2::PrincipalAuthenticator_var pa = - manager->principal_authenticator (TAO_ENV_SINGLE_ARG_PARAMETER); + manager->principal_authenticator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_PrincipalAuthenticator_var tao_pa = TAO_PrincipalAuthenticator::_narrow (pa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityReplaceable::Vault_ptr vault; @@ -160,25 +160,25 @@ TAO_SSLIOP_ORBInitializer::post_init ( SecurityReplaceable::Vault_var safe_vault = vault; // :-) tao_pa->register_vault (vault - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } size_t TAO_SSLIOP_ORBInitializer::get_tss_slot_id ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Obtain the Security Service TSS slot ID from the SecurityCurrent // object. CORBA::Object_var obj = info->resolve_initial_references ("SecurityCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); SecurityLevel2::Current_var current = SecurityLevel2::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Security_Current *security_current = diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 874ec46fa91..1c610432e8e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -53,11 +53,11 @@ public: TAO_SSLIOP_ORBInitializer (Security::QOP qop); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -65,7 +65,7 @@ private: // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object. size_t get_tss_slot_id ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp index a28808b374b..08c2f808c35 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp @@ -14,7 +14,7 @@ TAO_SSLIOP_ReceivedCredentials::TAO_SSLIOP_ReceivedCredentials (X509 *cert, } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_ReceivedCredentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_ReceivedCredentials *c = 0; @@ -33,7 +33,7 @@ TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) Security::InvocationCredentialsType TAO_SSLIOP_ReceivedCredentials::credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecReceivedCredentials; @@ -41,7 +41,7 @@ TAO_SSLIOP_ReceivedCredentials::credentials_type ( SecurityLevel2::Credentials_ptr TAO_SSLIOP_ReceivedCredentials::accepting_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -54,7 +54,7 @@ TAO_SSLIOP_ReceivedCredentials::accepting_credentials ( Security::AssociationOptions TAO_SSLIOP_ReceivedCredentials::association_options_used ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -69,7 +69,7 @@ TAO_SSLIOP_ReceivedCredentials::association_options_used ( Security::DelegationState TAO_SSLIOP_ReceivedCredentials::delegation_state ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // It is not possible to perform credentials delegation with SSLIOP, @@ -80,7 +80,7 @@ TAO_SSLIOP_ReceivedCredentials::delegation_state ( Security::DelegationMode TAO_SSLIOP_ReceivedCredentials::delegation_mode ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // SSLIOP does not support delegation. @@ -91,16 +91,16 @@ TAO_SSLIOP_ReceivedCredentials::delegation_mode ( TAO_SSLIOP_ReceivedCredentials_ptr TAO_SSLIOP_ReceivedCredentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_ReceivedCredentials_ptr TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_ReceivedCredentials::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h index 820dce9b20a..778a6ac28ae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h @@ -52,11 +52,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -68,19 +68,19 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr accepting_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions association_options_used ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::DelegationState delegation_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::DelegationMode delegation_mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -97,12 +97,12 @@ public: static TAO_SSLIOP_ReceivedCredentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_ReceivedCredentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_ReceivedCredentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index 4fd1c9b7c59..eff8dbf4820 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -15,7 +15,7 @@ TAO_SSLIOP_TargetCredentials::TAO_SSLIOP_TargetCredentials (X509 *cert, } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_TargetCredentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_TargetCredentials *c = 0; @@ -34,7 +34,7 @@ TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) Security::InvocationCredentialsType TAO_SSLIOP_TargetCredentials::credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecTargetCredentials; @@ -42,7 +42,7 @@ TAO_SSLIOP_TargetCredentials::credentials_type ( SecurityLevel2::Credentials_ptr TAO_SSLIOP_TargetCredentials::initiating_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -55,7 +55,7 @@ TAO_SSLIOP_TargetCredentials::initiating_credentials ( Security::AssociationOptions TAO_SSLIOP_TargetCredentials::association_options_used ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -70,16 +70,16 @@ TAO_SSLIOP_TargetCredentials::association_options_used ( TAO_SSLIOP_TargetCredentials_ptr TAO_SSLIOP_TargetCredentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_TargetCredentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_TargetCredentials_ptr TAO_SSLIOP_TargetCredentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_TargetCredentials::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index c7057863cf6..7bf32d6c168 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -50,11 +50,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -66,11 +66,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr initiating_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions association_options_used ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -87,12 +87,12 @@ public: static TAO_SSLIOP_TargetCredentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_TargetCredentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_TargetCredentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 17f3c2aa201..834df616b15 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -19,7 +19,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_IIOP_Properties *tcp_properties, TAO_SSLIOP_Connection_Handler_State &s) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Go straight to the object_ref_table in the ORB Core to avoid @@ -29,12 +29,12 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, CORBA::Object_var obj = orb_core->object_ref_table ().resolve_initial_references ( "SSLIOPCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SSLIOP::Current_var current = SSLIOP::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (current.in ())) @@ -42,7 +42,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_SSLIOP_Current_var tao_current = TAO_SSLIOP_Current::_narrow (current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (tao_current.in ())) 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 ( diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h index b8d61031994..ab699654a5a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h @@ -66,11 +66,11 @@ public: virtual Security::AuthenticationMethodList * get_supported_authen_methods ( const char * mechanism - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::OIDList * supported_mech_oids ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Authenticate the principal, request privileges and create @@ -93,7 +93,7 @@ public: SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AuthenticationStatus continue_credentials_acquisition ( @@ -101,12 +101,12 @@ public: SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IOP::TaggedComponentList * create_ior_components ( SecurityLevel2::Credentials_ptr creds_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationStatus init_security_context ( @@ -120,7 +120,7 @@ public: const Security::ChannelBindings & chan_binding, Security::OpaqueBuffer_out security_token, SecurityReplaceable::ClientSecurityContext_out security_context - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationStatus accept_security_context ( @@ -128,11 +128,11 @@ public: const Security::ChannelBindings & chan_bindings, const Security::Opaque & in_token, Security::Opaque_out out_token - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::MechandOptionsList * get_supported_mechs ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: |