4 files changed, 26 insertions, 48 deletions

diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index 1e697edc9cc..f3cba5e3281 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -14,38 +14,37 @@ ACE_RCSID (ObjRefTemplate,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
-TAO::ORT_Adapter_Impl::tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORT_Adapter_Impl::tao_server_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->server_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ort_template_->server_id ();
 }
 
 char *
-TAO::ORT_Adapter_Impl::tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORT_Adapter_Impl::tao_orb_id (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ort_template_->orb_id ();
 }
 
 PortableInterceptor::AdapterName *
-TAO::ORT_Adapter_Impl::tao_adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+TAO::ORT_Adapter_Impl::tao_adapter_name (void)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No need to duplicate, the ort_template_ method has to do the duplicate
-  return this->ort_template_->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->ort_template_->adapter_name ();
 }
 
 CORBA::Object_ptr
 TAO::ORT_Adapter_Impl::make_object (const char *repo_id,
-                                    const PortableInterceptor::ObjectId &id
-                                    ACE_ENV_ARG_DECL)
+                                    const PortableInterceptor::ObjectId &id)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ort_factory_->make_object (repo_id,
                                           id
-                                          ACE_ENV_ARG_PARAMETER);
+                                         );
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
@@ -66,8 +65,7 @@ TAO::ORT_Adapter_Impl::get_obj_ref_factory (void)
 
 int
 TAO::ORT_Adapter_Impl::set_obj_ref_factory (
-  PortableInterceptor::ObjectReferenceFactory *cf
-  ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ObjectReferenceFactory *cf)
 {
   this->ort_factory_ = cf;
 
@@ -88,8 +86,7 @@ TAO::ORT_Adapter_Impl::activate (
   const char *server_id,
   const char *orb_id,
   PortableInterceptor::AdapterName *adapter_name,
-  PortableServer::POA_ptr poa
-  ACE_ENV_ARG_DECL)
+  PortableServer::POA_ptr poa)
 {
   // No need to lock here, there is one instance for each POA and
   // when the POA creates and actives an ORT_Adapter it will lock
@@ -102,7 +99,6 @@ TAO::ORT_Adapter_Impl::activate (
                                              adapter_name,
                                              poa),
                     CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
 
   this->ort_template_ = t;
 
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
index ff30c49bbdf..3b5c09072de 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h
@@ -26,11 +26,6 @@
 #include "tao/PortableServer/ORT_Adapter.h"
 #include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
@@ -48,8 +43,7 @@ namespace TAO
     virtual int activate (const char *server_id,
                           const char *orb_id,
                           PortableInterceptor::AdapterName *adapter_name,
-                          PortableServer::POA_ptr poa
-                          ACE_ENV_ARG_DECL);
+                          PortableServer::POA_ptr poa);
 
     /// Accessor methods to ObjectReferenceTemplate template
     virtual PortableInterceptor::ObjectReferenceTemplate *get_adapter_template (void);
@@ -59,8 +53,7 @@ namespace TAO
 
     /// Set a different ort_factory to be used.
     virtual int set_obj_ref_factory (
-      PortableInterceptor::ObjectReferenceFactory * current_factory
-      ACE_ENV_ARG_DECL);
+      PortableInterceptor::ObjectReferenceFactory * current_factory);
 
     /**
      * @see @c TAO::ORT_Adapter for details.
@@ -72,14 +65,13 @@ namespace TAO
      * Methods
      */
     //@{
-    virtual char * tao_server_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual char * tao_server_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual char * tao_orb_id (ACE_ENV_SINGLE_ARG_DECL)
+    virtual char * tao_orb_id (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableInterceptor::AdapterName * tao_adapter_name (
-        ACE_ENV_SINGLE_ARG_DECL)
+    virtual PortableInterceptor::AdapterName * tao_adapter_name (void)
         ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
@@ -92,8 +84,7 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
         const char * repository_id,
-        const PortableInterceptor::ObjectId & id
-        ACE_ENV_ARG_DECL)
+        const PortableInterceptor::ObjectId & id)
     ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
@@ -111,10 +102,6 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_ORT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 5aade26a354..eb25db6608c 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -29,21 +29,21 @@ namespace TAO
   }
 
   char *
-  ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ObjectReferenceTemplate::server_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->server_id_);
   }
 
   char *
-  ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ObjectReferenceTemplate::orb_id (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup (this->orb_id_);
   }
 
   PortableInterceptor::AdapterName *
-  ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  ObjectReferenceTemplate::adapter_name (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableInterceptor::AdapterName *adapter_name = 0;
@@ -56,7 +56,6 @@ namespace TAO
                               TAO::VMCID,
                               ENOMEM),
                           CORBA::COMPLETED_NO));
-    ACE_CHECK_RETURN (0);
 
     return adapter_name;
   }
@@ -65,7 +64,7 @@ namespace TAO
   ObjectReferenceTemplate::make_object (
       const char *,
       const PortableInterceptor::ObjectId &
-      ACE_ENV_ARG_DECL)
+      )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (CORBA::is_nil(poa_.in()))
@@ -73,7 +72,7 @@ namespace TAO
 
     TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in());
 
-    return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    return tao_poa->invoke_key_to_object ();
   }
 }
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index cb19700492a..eeb4cae1deb 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -69,14 +69,13 @@ namespace TAO
      * PortableInterceptor::ObjectReferenceTemplate ValueType.
      */
     //@{
-    virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * server_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual char * orb_id (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableInterceptor::AdapterName * adapter_name (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    virtual PortableInterceptor::AdapterName * adapter_name (void)
       ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
@@ -89,11 +88,8 @@ namespace TAO
     //@{
     virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-                       CORBA::SystemException
-                       ));
+      const PortableInterceptor::ObjectId & id)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     //@}
 
   protected: