zapped environment macros

8 files changed, 58 insertions, 115 deletions

diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
index 417dfe1e57b..383010249a7 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp
@@ -51,8 +51,7 @@ TAO_Client_Network_Priority_Policy::TAO_Client_Network_Priority_Policy (
 }
 
 CORBA::Policy_ptr
-TAO_Client_Network_Priority_Policy::create (const CORBA::Any &val
-  ACE_ENV_ARG_DECL)
+TAO_Client_Network_Priority_Policy::create (const CORBA::Any &val)
 {
   CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
 
@@ -63,14 +62,12 @@ TAO_Client_Network_Priority_Policy::create (const CORBA::Any &val
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
 
 CORBA::PolicyType
-TAO_Client_Network_Priority_Policy::policy_type (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Client_Network_Priority_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::CLIENT_NETWORK_PRIORITY_TYPE;
@@ -87,8 +84,7 @@ TAO_Client_Network_Priority_Policy::clone (void) const
 }
 
 TAO::DiffservCodepoint
-TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_diffserv_codepoint_;
@@ -96,16 +92,14 @@ TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (
 
 void
 TAO_Client_Network_Priority_Policy::request_diffserv_codepoint (
-   TAO::DiffservCodepoint req_dscp
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   TAO::DiffservCodepoint req_dscp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_diffserv_codepoint_ = req_dscp;
 }
 
 TAO::DiffservCodepoint
-TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->reply_diffserv_codepoint_;
@@ -113,30 +107,27 @@ TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (
 
 void
 TAO_Client_Network_Priority_Policy::reply_diffserv_codepoint (
-   TAO::DiffservCodepoint reply_dscp
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   TAO::DiffservCodepoint reply_dscp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->reply_diffserv_codepoint_ = reply_dscp;
 }
 
 TAO::NetworkPriorityModel
-TAO_Client_Network_Priority_Policy::network_priority_model (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Client_Network_Priority_Policy::network_priority_model (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->network_priority_model_;
 }
 
 CORBA::Policy_ptr
-TAO_Client_Network_Priority_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Client_Network_Priority_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Client_Network_Priority_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
                     TAO_Client_Network_Priority_Policy (*this),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
@@ -160,5 +151,4 @@ TAO_Client_Network_Priority_Policy::_tao_scope (void) const
                                         TAO_POLICY_CLIENT_EXPOSED);
 }
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
index 2e4e3395693..244d6adb188 100644
--- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  
+ *
  */
 //=============================================================================
 
@@ -25,7 +25,6 @@
 
 #include "tao/LocalObject.h"
 #include "tao/Basic_Types.h"
-#include "ace/SString.h"
 #include "tao/DiffServPolicyC.h"
 
 #if defined(_MSC_VER)
@@ -64,36 +63,30 @@ public:
   /// Returns a copy of <this>.
   TAO_Client_Network_Priority_Policy *clone (void) const;
 
-  TAO::DiffservCodepoint request_diffserv_codepoint (ACE_ENV_SINGLE_ARG_DECL)
+  TAO::DiffservCodepoint request_diffserv_codepoint (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void request_diffserv_codepoint (
-      TAO::DiffservCodepoint req_dscp 
-      ACE_ENV_SINGLE_ARG_DECL)
+  void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  TAO::DiffservCodepoint reply_diffserv_codepoint (ACE_ENV_SINGLE_ARG_DECL)
+  TAO::DiffservCodepoint reply_diffserv_codepoint (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void reply_diffserv_codepoint (
-      TAO::DiffservCodepoint reply_dscp 
-      ACE_ENV_SINGLE_ARG_DECL)
+  void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  TAO::NetworkPriorityModel network_priority_model (
-    ACE_ENV_SINGLE_ARG_DECL)
+  TAO::NetworkPriorityModel network_priority_model (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr create (const CORBA::Any &val
-                            ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr create (const CORBA::Any &val);
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
index 3f5f8d050f9..e563874e26d 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.cpp
@@ -14,27 +14,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 CORBA::Policy_ptr
 TAO_DiffServ_PolicyFactory::create_policy (
     CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
+    const CORBA::Any &value)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
   if (type == TAO::CLIENT_NETWORK_PRIORITY_TYPE)
-    return TAO_Client_Network_Priority_Policy::create (value
-              ACE_ENV_ARG_PARAMETER);
+    return TAO_Client_Network_Priority_Policy::create (value);
 
   if (type == TAO::NETWORK_PRIORITY_TYPE)
-    return TAO_Server_Network_Priority_Policy::create (value
-              ACE_ENV_ARG_PARAMETER);
+    return TAO_Server_Network_Priority_Policy::create (value);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
 }
 
 CORBA::Policy_ptr
-TAO_DiffServ_PolicyFactory::_create_policy (
-    CORBA::PolicyType type
-    ACE_ENV_ARG_DECL)
+TAO_DiffServ_PolicyFactory::_create_policy (CORBA::PolicyType type)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -49,7 +44,6 @@ TAO_DiffServ_PolicyFactory::_create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
@@ -63,7 +57,6 @@ TAO_DiffServ_PolicyFactory::_create_policy (
                             TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       return policy;
     }
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
index f516fe5e819..78733a8ca53 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h
@@ -44,13 +44,11 @@ class TAO_DiffServPolicy_Export TAO_DiffServ_PolicyFactory
 public:
 
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any &value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   const CORBA::Any &value)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
-  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr _create_policy (CORBA::PolicyType type)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
index c4756e371fd..11429ab6040 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.cpp
@@ -14,27 +14,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO_DiffServPolicy_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ORBInitInfo_ptr)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_DiffServPolicy_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ORBInitInfo_ptr info)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->register_policy_factories (info);
 }
 
 void
 TAO_DiffServPolicy_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
+  PortableInterceptor::ORBInitInfo_ptr info)
 {
   if (CORBA::is_nil (this->policy_factory_.in ()))
     {
@@ -46,7 +41,6 @@ TAO_DiffServPolicy_ORBInitializer::register_policy_factories (
                               TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
-      ACE_CHECK;
 
       this->policy_factory_ = policy_factory;
     }
@@ -61,19 +55,16 @@ TAO_DiffServPolicy_ORBInitializer::register_policy_factories (
 
   const CORBA::PolicyType *end =
     type + sizeof (type) / sizeof (type[0]);
-  
+
   for (CORBA::PolicyType const * i = type;
        i != end;
        ++i)
     {
-      ACE_TRY
+      try
         {
-          info->register_policy_factory (*i,
-                                         this->policy_factory_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+          info->register_policy_factory (*i, this->policy_factory_.in ());
         }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+      catch ( ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -84,15 +75,13 @@ TAO_DiffServPolicy_ORBInitializer::register_policy_factories (
               // ORBInitializer.
               return;
             }
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_CATCHANY
+      catch ( ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
-          ACE_RE_THROW;
+          throw;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
     }
 }
 
diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
index 41c23112f5c..46540566415 100644
--- a/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
+++ b/TAO/tao/DiffServPolicy/DiffServPolicy_ORBInitializer.h
@@ -42,20 +42,16 @@ class TAO_DiffServPolicy_Export TAO_DiffServPolicy_ORBInitializer
   , public virtual TAO_Local_RefCounted_Object
 {
 public:
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Register DiffServ policy factories.
-  void register_policy_factories (
-                                  PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
+  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
 
 private:
   PortableInterceptor::PolicyFactory_var policy_factory_;
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
index d1e2d784416..1a29e9984e0 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp
@@ -55,8 +55,7 @@ TAO_Server_Network_Priority_Policy::TAO_Server_Network_Priority_Policy (
 }
 
 CORBA::Policy_ptr
-TAO_Server_Network_Priority_Policy::create (const CORBA::Any &val
-  ACE_ENV_ARG_DECL)
+TAO_Server_Network_Priority_Policy::create (const CORBA::Any &val)
 {
   CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
 
@@ -67,14 +66,12 @@ TAO_Server_Network_Priority_Policy::create (const CORBA::Any &val
                         TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return policy;
 }
 
 CORBA::PolicyType
-TAO_Server_Network_Priority_Policy::policy_type (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Server_Network_Priority_Policy::policy_type (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::NETWORK_PRIORITY_TYPE;
@@ -91,8 +88,7 @@ TAO_Server_Network_Priority_Policy::clone (void) const
 }
 
 TAO::DiffservCodepoint
-TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_diffserv_codepoint_;
@@ -100,16 +96,14 @@ TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (
 
 void
 TAO_Server_Network_Priority_Policy::request_diffserv_codepoint (
-   TAO::DiffservCodepoint req_dscp
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   TAO::DiffservCodepoint req_dscp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_diffserv_codepoint_ = req_dscp;
 }
 
 TAO::DiffservCodepoint
-TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->reply_diffserv_codepoint_;
@@ -117,36 +111,33 @@ TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (
 
 void
 TAO_Server_Network_Priority_Policy::reply_diffserv_codepoint (
-   TAO::DiffservCodepoint reply_dscp
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+   TAO::DiffservCodepoint reply_dscp)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->reply_diffserv_codepoint_ = reply_dscp;
 }
 
 TAO::NetworkPriorityModel
-TAO_Server_Network_Priority_Policy::network_priority_model (
-   ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Server_Network_Priority_Policy::network_priority_model (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->network_priority_model_;
 }
 
 CORBA::Policy_ptr
-TAO_Server_Network_Priority_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Server_Network_Priority_Policy::copy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Server_Network_Priority_Policy* servant = 0;
   ACE_NEW_THROW_EX (servant,
                     TAO_Server_Network_Priority_Policy (*this),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return servant;
 }
 
 void
-TAO_Server_Network_Priority_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Server_Network_Priority_Policy::destroy (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -167,7 +158,7 @@ TAO_Server_Network_Priority_Policy::_tao_scope (void) const
 CORBA::Boolean
 TAO_Server_Network_Priority_Policy::_tao_encode (TAO_OutputCDR &out_cdr)
 {
-  return ((out_cdr << request_diffserv_codepoint_) && 
+  return ((out_cdr << request_diffserv_codepoint_) &&
           (out_cdr << reply_diffserv_codepoint_) &&
           (out_cdr << network_priority_model_));
 }
diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
index f459ea391b8..08129561a86 100644
--- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
+++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  
+ *
  */
 //=============================================================================
 
@@ -25,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/SString.h"
 #include "tao/Basic_Types.h"
 
 #if defined(_MSC_VER)
@@ -65,36 +64,30 @@ public:
   /// Returns a copy of <this>.
   TAO_Server_Network_Priority_Policy *clone (void) const;
 
-  TAO::DiffservCodepoint request_diffserv_codepoint (ACE_ENV_SINGLE_ARG_DECL)
+  TAO::DiffservCodepoint request_diffserv_codepoint (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void request_diffserv_codepoint (
-      TAO::DiffservCodepoint req_dscp
-      ACE_ENV_SINGLE_ARG_DECL)
+  void request_diffserv_codepoint (TAO::DiffservCodepoint req_dscp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  TAO::DiffservCodepoint reply_diffserv_codepoint (ACE_ENV_SINGLE_ARG_DECL)
+  TAO::DiffservCodepoint reply_diffserv_codepoint (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void reply_diffserv_codepoint (
-      TAO::DiffservCodepoint reply_dscp
-      ACE_ENV_SINGLE_ARG_DECL)
+  void reply_diffserv_codepoint (TAO::DiffservCodepoint reply_dscp)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  TAO::NetworkPriorityModel network_priority_model (
-    ACE_ENV_SINGLE_ARG_DECL)
+  TAO::NetworkPriorityModel network_priority_model (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr create (const CORBA::Any &val
-                            ACE_ENV_ARG_DECL);
+  CORBA::Policy_ptr create (const CORBA::Any &val);
 
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.