CE UNICODE fixes.

4 files changed, 9 insertions, 9 deletions

diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 555d9641244..7261ca1a1bb 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -323,7 +323,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                 ASYS_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"),
                 ((host_name == 0) ?
                  (ASYS_TEXT ("<unknown>")) :
-                 (ASYS_WIDE_STRING (host_name)))));
+                 host_name)));
 #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
 }
 
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 65983c339ce..925df2994c5 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -3710,7 +3710,7 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[])
                            &process_info))
 #   else
       if (::CreateProcess (0,
-                           (LPTSTR) ACE_WIDE_STRING (buf),
+                           (LPTSTR) buf,
                            0, // No process attributes.
                            0,  // No thread attributes.
                            FALSE, // Can's inherit handles on CE
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index a2fbd12780f..da2bd33804d 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -457,7 +457,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *)
 
       this->symbol_ = (void *)
         ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
-                       ASYS_WIDE_STRING (object_name));
+                       object_name);
 
       if (this->symbol_ == 0)
         {
@@ -465,7 +465,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *)
 
           ACE_ERROR ((LM_ERROR,
                       ASYS_TEXT ("dlsym failed for object %s\n"),
-                      ASYS_WIDE_STRING (object_name)));
+                      object_name));
 
           ASYS_TCHAR *errmsg = ACE_OS::dlerror ();
 
@@ -519,7 +519,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       // Locate the factory function <function_name> in the shared
       // object.
 
-      ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_);
+      char *function_name = ACE_const_cast (char *, this->function_name_);
 
       func = (void *(*)(ACE_Service_Object_Exterminator *))
         ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
@@ -558,7 +558,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
           ace_yyerrno++;
           ACE_ERROR_RETURN ((LM_ERROR,
                              ASYS_TEXT ("%p\n"),
-                             this->function_name_),
+                             ASYS_WIDE_STRING (this->function_name_)),
                             0);
         }
     }
@@ -638,7 +638,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
 
   ACE_Static_Svc_Descriptor **ssdp = 0;
   ACE_STATIC_SVCS &svcs = *ACE_Service_Config::static_svcs ();
-  ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_);
+  char *function_name = ACE_const_cast (char *, this->function_name_);
 
   for (ACE_STATIC_SVCS_ITERATOR iter (svcs);
        iter.next (ssdp) != 0;
@@ -673,7 +673,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       ace_yyerrno++;
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("%p\n"),
-                         this->function_name_),
+                         ACE_WIDE_STRING (this->function_name_)),
                         0);
     }
 
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 0a80ff0ada7..a603d4e8abe 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -229,7 +229,7 @@ ACE_Service_Config::parse_args (int argc, ASYS_TCHAR *argv[])
         break;
       case 'k':
         ACE_Service_Config::logger_key_ =
-          ACE_WIDE_STRING (getopt.optarg);
+          getopt.optarg;
         break;
       case 'n':
         ACE_Service_Config::no_static_svcs_ = 1;