1 files changed, 11 insertions, 11 deletions

diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index dc1288420cb..9b117727a8c 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -27,7 +27,7 @@
 #include "ace/Log_Msg.h"
 
 int
-main (int, char*[])
+ACE_TMAIN (int, ACE_TCHAR*[])
 {
   ACE_ERROR ((LM_INFO,
               "This program is only supported "
@@ -53,11 +53,11 @@ public:
   Options (void);
   ~Options (void);
 
-  int run (int argc, char *argv[]);
+  int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc,
-                   char *argv[]);
+                   ACE_TCHAR *argv[]);
   void print_usage_and_die (void);
 
 private:
@@ -112,9 +112,9 @@ Options::print_usage_and_die (void)
 }
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:rskt:d");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:rskt:d"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -147,7 +147,7 @@ Options::parse_args (int argc, char *argv[])
       default:
         // -i can also be given without a value - if so, it defaults
         // to defined value.
-        if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], "-i") == 0)
+        if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], ACE_TEXT("-i")) == 0)
           {
             opt_install = 1;
             opt_startup = DEFAULT_SERVICE_INIT_STARTUP;
@@ -169,13 +169,13 @@ ConsoleHandler (DWORD /* ctrlType */)
 
 ACE_NT_SERVICE_DEFINE (service,
                        TAO_NT_Naming_Service,
-                       "TAO NT Naming Service");
+                       ACE_TEXT("TAO NT Naming Service"));
 
 int
-Options::run (int argc, char* argv[])
+Options::run (int argc, ACE_TCHAR* argv[])
 {
-  SERVICE::instance ()->name ("TAO_NT_Naming_Service",
-                              "TAO NT Naming Service");
+  SERVICE::instance ()->name (ACE_TEXT("TAO_NT_Naming_Service"),
+                              ACE_TEXT("TAO NT Naming Service"));
 
   this->parse_args (argc, argv);
 
@@ -220,7 +220,7 @@ Options::run (int argc, char* argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return OPTIONS::instance ()->run (argc, argv);
 }