Fri Oct 11 13:49:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 58 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d575eb3a16b..9654665da5f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Fri Oct 11 13:49:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2926_Regression/DllORB.cpp
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
+        * orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
+        * orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+        * orbsvcs/tests/Notify/Basic/Events.cpp
+        * orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+        * orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+        * orbsvcs/tests/Notify/Basic/Sequence.cpp
+        * orbsvcs/tests/Notify/Basic/Simple.cpp
+        * orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
+        * orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+        * orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+        * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+        * orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+          ACE_TCHAR fixes
+
 Fri Oct 11 12:42:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/Sequence_Latency/AMI/client.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp b/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp
index a6efa86bf55..f432d67b0b1 100644
--- a/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp
+++ b/TAO/orbsvcs/tests/Bug_2926_Regression/DllORB.cpp
@@ -91,7 +91,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[])
 
       // Initialize the ORB
       ACE_Argv_Type_Converter argcon (argc, argv);
-      mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_TCHAR_argv ());
       if (CORBA::is_nil (mv_orb_.in ()))
         {
           ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
index f0abd9869e4..0b6139b10d7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/client.cpp
@@ -44,7 +44,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ACE_Argv_Type_Converter argcon (argc, argv);
       CORBA::ORB_var orb = CORBA::ORB_init (argcon.get_argc (),
-                                            argcon.get_ASCII_argv ());
+                                            argcon.get_TCHAR_argv ());
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
index e0c3bdc5b60..43174ea972c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/server.cpp
@@ -47,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       ACE_Argv_Type_Converter argcon (argc, argv);
       CORBA::ORB_var orb = CORBA::ORB_init (argcon.get_argc (),
-                                            argcon.get_ASCII_argv ());
+                                            argcon.get_TCHAR_argv ());
 
       if (parse_args (argc, argv) != 0)
         return 1;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index bf1d853dda4..a2e5373f821 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -145,7 +145,7 @@ AdminProperties::parse_args(int argc, ACE_TCHAR *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
-  const char *current_arg = 0;
+  const ACE_TCHAR *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
@@ -168,7 +168,7 @@ AdminProperties::parse_args(int argc, ACE_TCHAR *argv[])
           // Max. number of suppliers allowed to connect.
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-reject_new_events") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-reject_new_events")) == 0)
         {
           this->reject_new_events_ = 1;
           arg_shifter.consume_arg ();
@@ -185,7 +185,7 @@ AdminProperties::parse_args(int argc, ACE_TCHAR *argv[])
           // Number of suppliers to create.
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-?") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0)
         {
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 02be3c05903..0d1672c7b02 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -137,7 +137,7 @@ ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[])
   ACE_Arg_Shifter arg_shifter (argc,
                               argv);
 
-    const char *current_arg = 0;
+    const ACE_TCHAR *current_arg = 0;
 
     while (arg_shifter.is_anything_left ())
     {
@@ -156,7 +156,7 @@ ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[])
           this->suppliers_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-?") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0)
         {
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index c1c399abe8e..4e67ef9f65a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -125,11 +125,11 @@ Events::parse_args (int argc,
 {
     ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
-    const char *current_arg = 0;
+    const ACE_TCHAR *current_arg = 0;
 
     while (arg_shifter.is_anything_left ())
     {
-      if (arg_shifter.cur_arg_strncasecmp ("-use_default_admin") == 0)
+      if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-use_default_admin")) == 0)
         {
           this->use_default_admin_ = 1;
           arg_shifter.consume_arg ();
@@ -141,7 +141,7 @@ Events::parse_args (int argc,
           // The number of events to send/receive.
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-?") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0)
         {
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 4468d38132c..f0ce981c42e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -29,7 +29,7 @@ LifeCycle::parse_args (int argc,
     ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
 
-    const char *current_arg = 0;
+    const ACE_TCHAR *current_arg = 0;
 
     while (arg_shifter.is_anything_left ())
     {
@@ -39,7 +39,7 @@ LifeCycle::parse_args (int argc,
           // The number of times to create and destroy.
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-?") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index ca25091049b..aebb3cf1a7b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -194,7 +194,7 @@ MultiTypes::init (int argc,
 }
 
 int
-MultiTypes::parse_args(int, char **)
+MultiTypes::parse_args(int, ACE_TCHAR **)
 {
   // Doesn't accept any arguments
   return 0;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index da328d19af7..d171dc845e9 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -133,7 +133,7 @@ Sequence::parse_args (int argc,
 {
     ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
-    const char *current_arg = 0;
+    const ACE_TCHAR *current_arg = 0;
 
     while (arg_shifter.is_anything_left ())
     {
@@ -168,7 +168,7 @@ Sequence::parse_args (int argc,
           arg_shifter.consume_arg ();
         }
 
-      else if (arg_shifter.cur_arg_strncasecmp ("-?") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0)
         {
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index 653021ea0d9..8af82cc6013 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -107,7 +107,7 @@ Simple_Test::parse_args (int argc,
     ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
 
-    const char *current_arg = 0;
+    const ACE_TCHAR *current_arg = 0;
 
     while (arg_shifter.is_anything_left ())
     {
@@ -117,7 +117,7 @@ Simple_Test::parse_args (int argc,
           // The number of events to send/receive.
           arg_shifter.consume_arg ();
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-?") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-?")) == 0)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
index 4a3e1c096d5..c5c000dc712 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Consumer.cpp
@@ -100,7 +100,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     {
       Consumer_Client client;
       ACE_Argv_Type_Converter argcon (argc, argv);
-      status = client.init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      status = client.init (argcon.get_argc (), argcon.get_TCHAR_argv ());
 
       if (status == 0)
         {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
index 06d92324391..3e686e7e445 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp
@@ -151,7 +151,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     {
       Supplier_Client client;
       ACE_Argv_Type_Converter argcon (argc, argv);
-      status = client.init (argcon.get_argc (), argcon.get_ASCII_argv ());
+      status = client.init (argcon.get_argc (), argcon.get_TCHAR_argv ());
 
       if (status == 0)
         {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
index 0f29eb67cee..d6843ed73b2 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp
@@ -45,7 +45,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[])
 
     // Initialize the ORB
     ACE_Argv_Type_Converter argcon (argc, argv);
-    mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ());
+    mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_TCHAR_argv ());
     if (CORBA::is_nil (mv_orb_.in ()))
     {
       ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n")));
@@ -102,6 +102,9 @@ DllOrb::fini (void)
     // attempt to protect against sporadic BAD_INV_ORDER exceptions
     ACE_OS::sleep (ACE_Time_Value (0, 500));
 
+      mv_rootPOA_->destroy (1, 1);
+
+      mv_rootPOA_ = PortableServer::POA::_nil ();
     mv_orb_->shutdown (1);
 
     ACE_DEBUG ((LM_ERROR, ACE_TEXT ("wait() ...\n")));
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index abd89ea8273..4077dee7a7c 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -13,7 +13,7 @@
 
 #include "DllOrb.h"
 
-char const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "testDllOrb",
   "Bug_3252",
   "_make_DllOrb",
@@ -21,17 +21,16 @@ char const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "-ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa"
 );
 
-char const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
+ACE_TCHAR const * const scpc_unloadOrb = ACE_REMOVE_SERVICE_DIRECTIVE("testDllOrb");
 
-char const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
   "testNotifyService",
   "TAO_CosNotification_Serv",
   "_make_TAO_CosNotify_Service",
   "-UseSeparateDispatchingORB 1"
 );
 
-char const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService");
-
+ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService");
 
 int
 unloadNotify(ACE_Service_Config & r_serviceConfig)
@@ -145,12 +144,12 @@ ACE_TMAIN(int, ACE_TCHAR **argv)
 {
   int result = 0;
 
-  char signum[64];
-  ACE_OS::sprintf(signum, "%d", SIGUSR1);
+  ACE_TCHAR signum[64];
+  ACE_OS::sprintf(signum, ACE_TEXT("%d"), SIGUSR1);
 
   ACE_ARGV args;
   args.add(argv[0]);
-  args.add("-s");
+  args.add(ACE_TEXT("-s"));
   args.add(signum);
 
   ACE_Service_Config &serviceConfig = *ACE_Service_Config::singleton ();
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index fc904d95551..c16a547b513 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -39,13 +39,13 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
 
   if (arg_shifter.is_anything_left ())
     {
-      if (arg_shifter.cur_arg_strncasecmp ("-Create") == 0)
+      if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Create")) == 0)
         {
           this->command_ = CREATE;
 
           arg_shifter.consume_arg ();
 
-          this->POA_name_ = arg_shifter.get_current ();
+          this->POA_name_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ());
 
           arg_shifter.consume_arg ();
 
@@ -53,7 +53,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
             {
               if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-PriorityModel"))))
                 {
-                  if (arg_shifter.cur_arg_strncasecmp ("CLIENT") == 0)
+                  if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("CLIENT")) == 0)
                     priority_model_ = RTCORBA::CLIENT_PROPAGATED;
                   else
                     priority_model_ = RTCORBA::SERVER_DECLARED;
@@ -75,7 +75,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                   //parse lane values ...
                   while (arg_shifter.is_anything_left ())
                     {
-                      if (arg_shifter.cur_arg_strncasecmp ("-Lane") == 0)
+                      if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Lane")) == 0)
                         {
                           arg_shifter.consume_arg ();
 
@@ -113,7 +113,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                   //parse band values ...
                   while (arg_shifter.is_anything_left ())
                     {
-                      if (arg_shifter.cur_arg_strncasecmp ("-Band") == 0)
+                      if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Band")) == 0)
                         {
                           arg_shifter.consume_arg ();
 
@@ -138,7 +138,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
                 } /* if -Bands */
 
               // -ThreadPool thread_pool_count thread_pool_default_priority
-              if (arg_shifter.cur_arg_strncasecmp ("-ThreadPool") == 0)
+              if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-ThreadPool")) == 0)
                 {
                   arg_shifter.consume_arg ();
 
@@ -163,13 +163,13 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
               break;
             } /* while */
         }
-      else if (arg_shifter.cur_arg_strncasecmp ("-Destroy") == 0)
+      else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Destroy")) == 0)
         {
           this->command_ = DESTROY;
 
           arg_shifter.consume_arg ();
 
-          this->POA_name_ = arg_shifter.get_current ();
+          this->POA_name_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ());
 
           arg_shifter.consume_arg ();
         }