Wed Oct 8 10:58:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 21 insertions, 21 deletions

diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index ca22b01f7f6..e5c5fd21331 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -51,7 +51,7 @@ int TestClient::parseCommands (int argc, ACE_TCHAR *argv[])
 
     case 'r':
       {
-        const char* opt = get_opts.opt_arg();
+        const ACE_TCHAR* opt = get_opts.opt_arg();
         if (opt[0] == 'r') { randomRequests_ = true; opt++; }
         requestCount_ = ACE_OS::atoi(opt);
         break;
@@ -59,14 +59,14 @@ int TestClient::parseCommands (int argc, ACE_TCHAR *argv[])
 
     case 'x':
       {
-        const char* opt = get_opts.opt_arg();
+        const ACE_TCHAR* opt = get_opts.opt_arg();
         shutdownOrb_ = (opt && opt[0] != '0');
         break;
       }
 
     case 'e':
       {
-        const char* opt = get_opts.opt_arg();
+        const ACE_TCHAR* opt = get_opts.opt_arg();
         while (opt && *opt != '\0')
         {
           if (*opt == 'h') expectHolding_ = true;
@@ -252,7 +252,7 @@ int TestClient::svc()
   catch (CORBA::Exception& ex)
   {
     ACE_ERROR((LM_ERROR,"CORBA client error with (%d.%d.%d.%d):%s\n",
-               threadNum, i, objIter, requestIter, ACE_TEXT_CHAR_TO_TCHAR (currentIOR.c_str())));
+               threadNum, i, objIter, requestIter, currentIOR.c_str()));
     ex._tao_print_exception ("");
   }
   return 1;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index d8225ac077b..d51a47724d5 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -46,7 +46,7 @@ string normalizePath(const string& dir, char delim, bool toLower)
     {
       return string ();
     }
-    
+
   char buffer[PATH_MAX + 2];
 
   string::size_type i = 0;
@@ -59,7 +59,7 @@ string normalizePath(const string& dir, char delim, bool toLower)
   string::size_type begin = i;
 
   int j = 0;
-  
+
   for (; i < dir.size (); i++)
     {
       if (dir[i] == '\\' || dir[i] == '/')
@@ -99,21 +99,21 @@ string normalizePath(const string& dir, char delim, bool toLower)
                   ACE_OS::strncpy (buffer, curDir.c_str (), sizeof( buffer));
                   j = curDir.length();
                 }
-                
+
               int k = j;
-              
+
               for (; buffer[k] != delim; k--)
                 {
                   // No action.
                 }
-                
+
               k--;
-              
+
               for (; buffer[k] != delim; k--)
                 {
                   // No action.
                 }
-                
+
               j = (k + 1);
               i += 2;
             }
@@ -127,7 +127,7 @@ string normalizePath(const string& dir, char delim, bool toLower)
                 {
                   buffer[j] = dir[i];
                 }
-                
+
               j++;
             }
         }
@@ -142,7 +142,7 @@ string normalizePath(const string& dir, char delim, bool toLower)
             {
               buffer[j] = dir[i];
             }
-            
+
           j++;
         }
     }
@@ -151,7 +151,7 @@ string normalizePath(const string& dir, char delim, bool toLower)
     {
       j--;
     }
-    
+
   buffer[j] ='\0';
   return string(buffer);
 }
@@ -204,12 +204,12 @@ int TestServer::parseCommands (int argc, ACE_TCHAR *argv[])
     switch (c)
     {
     case 'w':
-      expectedDir_ = normalizePath(get_opts.opt_arg());
+      expectedDir_ = normalizePath(ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg()));
       break;
 
     case 'e':
       {
-        string name = get_opts.opt_arg();
+        string name = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg());
         string::size_type i = name.find_first_of("=");
         string value = name.substr(i +  1, name.length() - 1);
         name.resize(i);
@@ -223,21 +223,21 @@ int TestServer::parseCommands (int argc, ACE_TCHAR *argv[])
 
     case 't':
       {
-        const char* opt = get_opts.opt_arg();
+        const ACE_TCHAR* opt = get_opts.opt_arg();
         useIORTable_ = (opt && opt[0] != '0');
         break;
       }
 
     case 'q':
       {
-        const char* opt = get_opts.opt_arg();
+        const ACE_TCHAR* opt = get_opts.opt_arg();
         retryQuery_ = (opt && opt[0] != '0');
         break;
       }
 
     case 'o':
       {
-        const char* opt = get_opts.opt_arg();
+        const ACE_TCHAR* opt = get_opts.opt_arg();
         writeIORFile_ = (opt && opt[0] != '0');
         break;
       }
@@ -275,7 +275,7 @@ int TestServer::parseCommands (int argc, ACE_TCHAR *argv[])
       break;
 
     case 'b':
-      baseDir_ =  get_opts.opt_arg();
+      baseDir_ =  ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg());
       break;
 
     case '?':
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 32cf01158a6..075f2a9d0ba 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -26,7 +26,7 @@ public:
   {
     ACE_ASSERT(s != 0);
     ACE_ASSERT(ACE_OS::strlen(s) > 0);
-    return asc_.process_directive(s);
+    return asc_.process_directive(ACE_TEXT_CHAR_TO_TCHAR(s));
   }
 
   virtual void reconfigure()