ChangeLogTag: Tue Jun 17 13:55:00 UTC 2008 Simon Massey <sma at prismtech dot com>

21 files changed, 80 insertions, 42 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e291b17e93d..736bb3fbc9a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,28 @@
+Tue Jun 17 13:55:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * TAO/examples/Borland/ChatClientWnd.cpp:
+        * TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
+        * TAO/orbsvcs/Naming_Service/Naming_Service.cpp:
+        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+        * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+        * TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp:
+        * TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
+        * TAO/tests/Bug_3315_Regression/main.cpp:
+        * TAO/tests/Bug_3321_Regression/main.cpp:
+        * TAO/tests/CSD_Collocation/Collocation_Tester.cpp:
+        * TAO/tests/File_IO/File_i.cpp:
+        * TAO/tests/Object_Loader/driver.cpp:
+        * TAO/tests/POA/Forwarding/server.cpp:
+        * TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp:
+        * TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptor.cpp:
+        * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp:
+        * TAO/tests/Reliable_Oneways/client.cpp:
+        * TAO/tests/RTCORBA/ORB_init/ORB_init.cpp:
+        * TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp:
+        * TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp:
+
+          Wide character build fixes.
+
 Tue Jun 17 13:37:09 UTC 2008  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
         * docs/configurations.html: Zapped the discussion of GIOPlite
diff --git a/TAO/examples/Borland/ChatClientWnd.cpp b/TAO/examples/Borland/ChatClientWnd.cpp
index d5749ce8a77..2aa01167766 100644
--- a/TAO/examples/Borland/ChatClientWnd.cpp
+++ b/TAO/examples/Borland/ChatClientWnd.cpp
@@ -23,7 +23,7 @@ __fastcall TChatClientWindow::TChatClientWindow (TComponent* Owner)
       ior_file_name_ = OpenDialog->FileName;
 
       // Retrieve the ORB.
-      orb_ = CORBA::ORB_init (_argc, _argv, 0);
+      orb_ = CORBA::ORB_init (_argc, _argv);
 
       // Get reference to the Root POA
       CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 71f9d9740c5..70cd143106c 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -24,7 +24,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       // Intialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
+        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv());
 
       // Call TAO_CEC_Event_Loader::init (argc, argv) from here.
       TAO_CEC_Event_Loader event_service;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index cdf138c397a..4cc99748f4a 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -30,22 +30,19 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[])
 
   try
     {
-      // Copy command line parameter.
-      ACE_Argv_Type_Converter command_line(argc, argv);
-
       // Initialize the ORB
       this->orb_ =
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
+        CORBA::ORB_init (argc, argv);
 
       // Parse the args for '-t' option. If '-t' option is passed, do
       // the needful and then remove the option from the list of
       // arguments.
-      this->parse_args (command_line.get_argc(), command_line.get_TCHAR_argv());
+      this->parse_args (argc, argv);
 
       // This function call initializes the naming service and returns
       // '-1' in case of an exception.
-      result = this->my_naming_server_.init_with_orb (command_line.get_argc(),
-                                                      command_line.get_TCHAR_argv(),
+      result = this->my_naming_server_.init_with_orb (argc,
+                                                      argv,
                                                       this->orb_.in ());
 
       if (result == -1)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 581ae6e2b04..572fe0832df 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -1380,7 +1380,8 @@ CORBA::Policy_ptr TAO_CEC_Default_Factory::create_roundtrip_timeout_policy
 {
   //get the existing orb
   int fake_argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (fake_argc, 0, this->orbid_);
+  ACE_TCHAR **fake_argv = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (fake_argc, fake_argv, this->orbid_);
 
   CORBA::Any value;
   TimeBase::TimeT timet;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index e8f7e35a480..42a2f6a53f1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -56,15 +56,12 @@ TAO_CEC_Event_Loader::init (int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      // Copy command line parameter.
-      ACE_Argv_Type_Converter command_line(argc, argv);
-
       // ORB initialization boiler plate...
       this->orb_=
-        CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), 0);
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var obj =
-        this->create_object (this->orb_.in (), command_line.get_argc(), command_line.get_TCHAR_argv());
+        this->create_object (this->orb_.in (), argc, argv);
 
       if (CORBA::is_nil (obj.in() ))
         return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index b5da2246bfe..4568a942049 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -44,8 +44,9 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel_Base *)
     {
       // @@ The ORBId could be important!!!
       int argc = 0;
+      ACE_TCHAR **argv = 0;
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, 0, "");
+        CORBA::ORB_init (argc, argv, "");
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("PriorityMappingManager");
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 5e207d98720..a5e53e41f4c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -132,7 +132,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           CORBA::String_var ec_str = orb->object_to_string (ec.in ());
 
           int no_args = 0;
-          CORBA::ORB_var s_orb = CORBA::ORB_init (no_args, 0,
+          ACE_TCHAR **no_argv = 0;
+          CORBA::ORB_var s_orb = CORBA::ORB_init (no_args, no_argv,
                                                   "Supplier_pure_client_ORB");
 
           CORBA::Object_var s_ec_obj = s_orb->string_to_object (ec_str.in ());
diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp
index 5c4abe02ce0..dc73933c08b 100644
--- a/TAO/tests/Bug_3315_Regression/main.cpp
+++ b/TAO/tests/Bug_3315_Regression/main.cpp
@@ -15,7 +15,8 @@ ACE_THR_FUNC_RETURN main_orb(void*)
   try
   {
     int argc = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, 0);
+    ACE_TCHAR **argv = 0;
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
     orb->destroy ();
   }
diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp
index f52f393db3e..9b3d04f14a5 100644
--- a/TAO/tests/Bug_3321_Regression/main.cpp
+++ b/TAO/tests/Bug_3321_Regression/main.cpp
@@ -21,7 +21,8 @@ ACE_THR_FUNC_RETURN main_orb(void*)
   try
   {
     int argc = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, 0);
+    ACE_TCHAR **argv = 0;
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
     TimeBase::TimeT CONNECTION_TIMEOUT = 1000000;
     TimeBase::TimeT ROUND_TRIP_TIMEOUT = 1000000;
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index 82547e04551..1934bc9a4e5 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -31,7 +31,7 @@ int
 Collocation_Test::init (int argc, char *argv[])
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   int result = this->parse_args (argc, argv);
   if (result != 0)
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 39a720c31ee..1142e9a7430 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -123,7 +123,8 @@ FileImpl::Descriptor::fd (void)
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0);
+  ACE_TCHAR **argv = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index e3c041aedc5..4c1096fdec8 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -24,8 +24,9 @@ ACE_TMAIN(int, ACE_TCHAR *[])
               ACE_OS::sprintf (buf, "ORB_%4.4d", j);
 
               int argc = 0;
+              ACE_TCHAR **argv = 0;
               CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, buf);
+                CORBA::ORB_init (argc, argv, buf);
 
               CORBA::Object_var object =
                 orb->string_to_object ("DLL:Test_Object");
@@ -60,8 +61,9 @@ ACE_TMAIN(int, ACE_TCHAR *[])
           ACE_OS::sprintf (buf, "ORB_%4.4d", j);
 
           int argc = 0;
+          ACE_TCHAR **argv = 0;
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, 0, buf);
+            CORBA::ORB_init (argc, argv, buf);
 
           CORBA::Object_var obj =
             orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/tests/POA/Forwarding/server.cpp b/TAO/tests/POA/Forwarding/server.cpp
index 28803529572..706b7a7f991 100644
--- a/TAO/tests/POA/Forwarding/server.cpp
+++ b/TAO/tests/POA/Forwarding/server.cpp
@@ -158,15 +158,13 @@ create_servant_manager (CORBA::ORB_ptr orb,
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
index 85366db4b77..cea1cd5c230 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp
@@ -53,7 +53,8 @@ Echo_Client_Request_Interceptor::send_request (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -178,7 +179,8 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -242,7 +244,8 @@ Echo_Client_Request_Interceptor::receive_other (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -285,7 +288,8 @@ Echo_Client_Request_Interceptor::receive_exception (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
index ccb493f659e..89f4e022ece 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp
@@ -50,7 +50,8 @@ Echo_Client_Request_Interceptor::send_request (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -110,7 +111,8 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -188,7 +190,8 @@ Echo_Client_Request_Interceptor::receive_exception (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
index fb01ff29c4c..ec3966e8759 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp
@@ -51,7 +51,8 @@ Echo_Client_Request_Interceptor::send_request (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -114,7 +115,8 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
@@ -188,7 +190,8 @@ Echo_Client_Request_Interceptor::receive_exception (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index 725288bf2f1..f0e7c5e1797 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -81,7 +81,8 @@ Client_Request_Interceptor::receive_exception (
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
+      ACE_TCHAR **argv = 0;
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     this->orb_id_.in ());
     }
 
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 8727011c296..353b8f29a50 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -8,7 +8,7 @@
 int
 test_multiple_orbs (const char *test_name,
                     int argc,
-                    char *argv[],
+                    ACE_TCHAR *argv[],
                     int iterations,
                     int rt_orb,
                     int destroy)
@@ -68,7 +68,7 @@ test_multiple_orbs (const char *test_name,
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int iterations = 5;
   int rt_orb = 0;
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index b705b0d12ee..ab8ccac5435 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -157,7 +157,8 @@ void
 set_sync_scope_policy (Messaging::SyncScope sync_scope)
 {
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "");
+  ACE_TCHAR **argv = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
   CORBA::Object_var object =
     orb->resolve_initial_references ("PolicyCurrent");
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 4c8074d7910..c1044d4bdb6 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -38,8 +38,9 @@ namespace Test {
     CORBA::String_var name (this->name ());
 
     int tmpargc = 0;
+    ACE_TCHAR **tmpargv = 0;
     CORBA::ORB_var orb = CORBA::ORB_init (tmpargc,
-                                          0,
+                                          tmpargv,
                                           orbid);
 
     CORBA::Object_var tcobject =