Corrected compile-time errors

2 files changed, 9 insertions, 12 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp
index d6b570c3efa..b5be5045b7a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp
@@ -17,14 +17,14 @@ TAO_MechanismPolicy::~TAO_MechanismPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_MechanismPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_MechanismPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return Security::SecMechanismPolicy;
+  return Security::SecMechanismsPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_MechanismPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_MechanismPolicy *policy = 0;
@@ -41,13 +41,13 @@ TAO_MechanismPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_MechanismPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_MechanismPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::MechanismTypeList *
-TAO_MechanismPolicy::mechanisms (CORBA::Environment &ACE_TRY_ENV)
+TAO_MechanismPolicy::mechanisms (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Security::MechanismTypeList *mechs = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
index c6d104f4c51..7a61ec97227 100644
--- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
@@ -52,22 +52,19 @@ public:
    * @name CORBA::Policy Methods
    */
   //@{
-  virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
   /// Return the list of mechanism types associated with this policy.
   virtual Security::MechanismTypeList mechanisms (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected: