ChangeLogTag: Wed Oct 27 07:15:25 2004 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 30 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0b72415f2c5..8b7a8395eba 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,16 +1,29 @@
+Wed Oct 27 07:15:25 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/HTIOP/AMI/client.cpp:
+        * orbsvcs/tests/HTIOP/AMI/server.cpp:
+        * orbsvcs/tests/HTIOP/AMI/simple_client.cpp:
+
+          Removed unnessesary CORBA environment arguments from
+          ACE_OS::socket_init().
+
+        * orbsvcs/tests/HTIOP/BiDirectional/server.cpp:
+
+          Added a necessary CORBA environment argument.
+
 Tue Oct 26 13:42:16 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
         * orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp:
         * orbsvcs//IFRService/ModuleDef_i.cpp:
-        
+
           Cosmetic changes.
-          
+
         * orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
         * orbsvcs/orbsvcs/IFRService/Contained_i.h:
         * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
         * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
-        
+
           Fixed a bug in entering a nested struct or union into the IFR.
           The IFR create_* methods for structs and unions require a
           list of members to be passed. If one of the members is also
@@ -27,16 +40,16 @@ Tue Oct 26 13:42:16 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Tue Oct 26 11:14:22 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
-	* orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
-	* orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-	* orbsvcs/orbsvcs/Log/LogMgr_i.h:
-	* orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
-	* orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
+        * orbsvcs/orbsvcs/Log/LogMgr_i.h:
+        * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+        * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
 
-	  Don't maintain a separate array of log id's, as it wasn't being
-	  updated when logs were removed, copied, etc.  Generate the list
-	  only when it is needed in TAO_LogMgr_i::list_logs_by_id().
+          Don't maintain a separate array of log id's, as it wasn't being
+          updated when logs were removed, copied, etc.  Generate the list
+          only when it is needed in TAO_LogMgr_i::list_logs_by_id().
 
 Tue Oct 26 12:59:47 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index c043b3922e2..2c4a18e6621 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -188,7 +188,7 @@ main (int argc, char *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-	  ACE_OS::socket_init (ACE_ENV_ARG_PARAMETER);
+      ACE_OS::socket_init ();
 
       CORBA::Object_var object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index 5349b07aeb7..ee6a7282b5f 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-	  ACE_OS::socket_init (ACE_ENV_ARG_PARAMETER);
+      ACE_OS::socket_init ();
 
       AMI_Test_i ami_test_i (orb.in ());
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 61665a72b5e..a1d6c7038e8 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -207,7 +207,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-	  ACE_OS::socket_init (ACE_ENV_ARG_PARAMETER);
+      ACE_OS::socket_init ();
 
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index eb2f9882467..b1d21dce77c 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -113,7 +113,8 @@ main (int argc, char *argv[])
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server_impl->_remove_ref();
+      server_impl->_remove_ref(ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         child_poa->id_to_reference (id.in ()