*** empty log message ***

1 files changed, 11 insertions, 11 deletions

diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index ae4b4e1673b..6f0e0b07c26 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -375,17 +375,17 @@ ACE_Name_Options::nameserver_port (void)
 }
 
 void   
-ACE_Name_Options::namespace_dir (const char *dir)
+ACE_Name_Options::namespace_dir (LPCTSTR dir)
 {
   ACE_TRACE ("ACE_Name_Options::namespace_dir");
   this->namespace_dir_ = ACE_OS::strdup (dir);
 }
 
 void   
-ACE_Name_Options::process_name (const char *pname)
+ACE_Name_Options::process_name (LPCTSTR pname)
 {
   ACE_TRACE ("ACE_Name_Options::process_name");
-  const char *t = ACE::basename (pname, ACE_DIRECTORY_SEPARATOR_CHAR);
+  LPCTSTR t = ACE::basename (pname, ACE_DIRECTORY_SEPARATOR_CHAR);
   this->process_name_ = ACE_OS::strdup (t);
 }
 
@@ -403,7 +403,7 @@ ACE_Name_Options::nameserver_host (void)
   return this->nameserver_host_;
 }
 
-const char *
+LPCTSTR
 ACE_Name_Options::database (void)
 {
   ACE_TRACE ("ACE_Name_Options::database");
@@ -411,7 +411,7 @@ ACE_Name_Options::database (void)
 }
 
 void   
-ACE_Name_Options::database (const char *db)
+ACE_Name_Options::database (LPCTSTR db)
 {
   ACE_TRACE ("ACE_Name_Options::database");
   if (this->database_ != 0)
@@ -447,14 +447,14 @@ ACE_Name_Options::context (ACE_Naming_Context::Context_Scope_Type context)
   this->context_ = context;
 }
 
-const char *
+LPCTSTR
 ACE_Name_Options::process_name (void)
 {
   ACE_TRACE ("ACE_Name_Options::process_name");
   return this->process_name_;
 }
 
-const char *
+LPCTSTR
 ACE_Name_Options::namespace_dir (void)
 {
   ACE_TRACE ("ACE_Name_Options::namespace_dir");
@@ -480,7 +480,7 @@ ACE_Name_Options::parse_args (int argc, char *argv[])
 {
   ACE_TRACE ("ACE_Name_Options::parse_args");
   ACE_LOG_MSG->open (argv[0]);
-  this->process_name (argv[0]);
+  this->process_name (ACE_WIDE_STRING (argv[0]));
 
   // Default is to use the PROC_LOCAL context...
   this->context (ACE_Naming_Context::PROC_LOCAL);
@@ -512,16 +512,16 @@ ACE_Name_Options::parse_args (int argc, char *argv[])
 	this->nameserver_host (get_opt.optarg);
 	break;
       case 'l':
-	this->namespace_dir (get_opt.optarg);
+	this->namespace_dir (ACE_WIDE_STRING (get_opt.optarg));
 	break;
       case 'P':
-	this->process_name (get_opt.optarg);
+	this->process_name (ACE_WIDE_STRING (get_opt.optarg));
 	break;
       case 'p':
 	this->nameserver_port (ACE_OS::atoi (get_opt.optarg));
 	break;
       case 's':
-	this->database (get_opt.optarg);
+	this->database (ACE_WIDE_STRING (get_opt.optarg));
 	break;
       case 'b':
 	this->base_address ((char *) ACE_OS::atoi (get_opt.optarg));