ChangeLogTag: Wed Jun 10 13:56:48 UTC 2009 Adam Mitz <mitza@ociweb.com>

4 files changed, 24 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d876863e528..644dd9fe377 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 10 13:56:48 UTC 2009  Adam Mitz  <mitza@ociweb.com>
+
+        * utils/logWalker/Log.h:
+        * utils/logWalker/Log.cpp:
+        * utils/logWalker/logWalker.cpp:
+
+          Fixed build errors with ACE_USES_WCHAR.
+
 Wed Jun 10 13:37:03 UTC 2009  Adam Mitz  <mitza@ociweb.com>
 
         * utils/logWalker/Log.cpp:
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 8d7d006293f..0d814c1c260 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -20,7 +20,7 @@ Log::~Log (void)
 }
 
 bool
-Log::init (ACE_TCHAR *filename, const char *alias)
+Log::init (const ACE_TCHAR *filename, const char *alias)
 {
   this->origin_ = ACE_TEXT_ALWAYS_CHAR (filename);
   this->alias_ = alias;
diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h
index ce403346afe..60a0c96e20d 100644
--- a/TAO/utils/logWalker/Log.h
+++ b/TAO/utils/logWalker/Log.h
@@ -26,7 +26,7 @@ public:
 
   ~Log();
 
-  bool init (ACE_TCHAR *filename, const char *alias = "");
+  bool init (const ACE_TCHAR *filename, const char *alias = "");
   void parse_line (char* line, size_t offset);
 
   void summarize(void);
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index af8b2b104c9..c3bf7477548 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -47,13 +47,13 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
         {
           if (buffer[1] == 'o')
             {
-              outfile = new char[ACE_OS::strlen(buffer) - 3];
-              ACE_OS::strcpy(buffer+3,outfile);
+              outfile = new ACE_TCHAR[ACE_OS::strlen(buffer) - 3];
+              ACE_OS::strcpy(buffer+3, ACE_TEXT_ALWAYS_CHAR(outfile));
               continue;
             }
           if (buffer[1] == 't')
             {
-              Session::set_tao_version (buffer+3);
+              Session::set_tao_version (ACE_TEXT_CHAR_TO_TCHAR (buffer + 3));
               continue;
             }
           if (buffer[1] == 'a')
@@ -73,12 +73,12 @@ parse_manifest (Session &session, ACE_TCHAR *filename)
                       buffer));
           return;
         }
-      ACE_Tokenizer tokens(buffer);
-      tokens.delimiter_replace('=',0);
+      ACE_Tokenizer_T<char> tokens(buffer);
+      tokens.delimiter_replace('=', 0);
       char *alias = tokens.next();
-      char *filename = tokens.next();
+      ACE_TString filename = ACE_TEXT_CHAR_TO_TCHAR(tokens.next());
       Log log(session);
-      log.init(filename,alias);
+      log.init(filename.c_str(), alias);
     }
 }
 
@@ -93,29 +93,29 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
   Session session;
   for (int i = 1; i < argc; i++)
     {
-      if (ACE_OS::strcasecmp (argv[i], "-o") == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-o")) == 0)
         {
           outfile = argv[++i];
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], "-m") == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-m")) == 0)
         {
           parse_manifest (session, argv[++i]);
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], "-t") == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-t")) == 0)
         {
           Session::set_tao_version (argv[++i]);
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], "-a") == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-a")) == 0)
         {
-          session.alternate_address (argv[++i]);
+          session.alternate_address (ACE_TEXT_ALWAYS_CHAR (argv[++i]));
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], "-p") == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-p")) == 0)
         {
-          session.default_service (argv[++i]);
+          session.default_service (ACE_TEXT_ALWAYS_CHAR (argv[++i]));
           continue;
         }