*** empty log message ***

3 files changed, 15 insertions, 14 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 47eb97831e9..33dc40e671e 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -70,10 +70,10 @@ parse_args (int argc, char* argv[])
 
 
 int
-ACE_TMAIN (int argc,
-      char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Argv_Type_Converter convert (argc, argv);
+// This test cannot be run on a wide character build
+// ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -82,12 +82,12 @@ ACE_TMAIN (int argc,
   ACE_TRY
     {
       // Initilaize the ORB, POA etc.
-      manager.init (convert.get_argc(), convert.get_ASCII_argv()
+      manager.init (argc, argv
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // the command line arguments
-      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
+      if (parse_args (argc, argv) == -1)
         return -1;
 
       // Merge the different IORS
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index 8789dca767f..09bfed08ece 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -5,14 +5,15 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Argv_Type_Converter convert (argc, argv);
+// This test cannot be run on a wide character build
+// ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Server_i svr_i;
 
-      const int init_result = svr_i.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
+      const int init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (init_result != 0)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index f6d6d099d85..ae74762fd3e 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -164,7 +164,7 @@ StructuredPushConsumer_i::push_structured_event (
   }
   if (notification.filterable_data.length () > 0)
   {
-    if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number"))
+    if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number"))
     {
       const CORBA::Any & data = notification.filterable_data[0].value;
 
@@ -190,8 +190,8 @@ StructuredPushConsumer_i::push_structured_event (
         ));
     }
   }
-  else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY")
-    && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, ""))
+  else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY")
+    && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), ""))
   {
     const CORBA::Any * any;
     if (notification.remainder_of_body >>= any)
@@ -399,7 +399,7 @@ SequencePushConsumer_i::push_structured_events (
     const CosNotification::StructuredEvent & notification = notifications[nevent];
     if (notification.filterable_data.length () > 0)
     {
-      if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number"))
+      if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number"))
       {
         const CORBA::Any & data = notification.filterable_data[0].value;
 
@@ -425,8 +425,8 @@ SequencePushConsumer_i::push_structured_events (
           ));
       }
     }
-    else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY")
-        && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, ""))
+    else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY")
+        && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), ""))
     {
       CORBA::ULong seq = 0;
       if (notification.remainder_of_body >>= seq)
@@ -620,7 +620,7 @@ AnyPushConsumer_i::push (
     {
       if (notification->filterable_data.length () > 0)
       {
-        if (0 == ACE_OS::strcmp (notification->filterable_data[0].name, "serial_number"))
+        if (0 == ACE_OS::strcmp (notification->filterable_data[0].name.in(), "serial_number"))
         {
           const CORBA::Any & data = notification->filterable_data[0].value;