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

5 files changed, 11 insertions, 14 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 79830e64f1d..ccfce40d702 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -74,7 +74,7 @@ private:
   int parse_args (void);
   // Parses the arguments passed on the command line.
 
-  int read_ior (char *filename);
+  int read_ior (ACE_TCHAR *filename);
   // Function to read the cubit factory IOR from a file.
 
   void print_stats (const char *call_name,
@@ -266,7 +266,7 @@ DII_Cubit_Client::parse_args (void)
         this->loop_count_ = ACE_OS::atoi (opts.opt_arg ());
         break;
       case 'i':   // Get the IOR from the command line.
-        this->factory_IOR_ = opts.opt_arg ();
+        this->factory_IOR_ = ACE_TEXT_ALWAYS_CHAR(opts.opt_arg ());
         break;
       case 'f':   // Read the IOR from the file.
         result = this->read_ior (opts.opt_arg ());
@@ -297,7 +297,7 @@ DII_Cubit_Client::parse_args (void)
 
 // Get the factory IOR from the file created by the server.
 int
-DII_Cubit_Client::read_ior (char *filename)
+DII_Cubit_Client::read_ior (ACE_TCHAR *filename)
 {
   // Open the file for reading.
   this->f_handle_ = ACE_OS::open (filename,0);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 1cb656f658e..5b66dccf4a1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -180,7 +180,7 @@ Cubit_Client::func (u_int i)
 // Reads the Cubit factory ior from a file
 
 int
-Cubit_Client::read_ior (const char *filename)
+Cubit_Client::read_ior (const ACE_TCHAR *filename)
 {
   // Open the file for reading.
   this->f_handle_ = ACE_OS::open (filename,0);
@@ -204,7 +204,7 @@ Cubit_Client::read_ior (const char *filename)
                         -1);
     }
 
-  this->cubit_factory_key_ = ACE_OS::strdup (data);
+  this->cubit_factory_key_ = ACE_OS::strdup (ACE_TEXT_CHAR_TO_TCHAR(data));
 
   ior_buffer.alloc ()->free (data);
 
@@ -250,14 +250,14 @@ Cubit_Client::parse_args (void)
         break;
       case 'v':
         // For backward compatibility
-        test_mask = this->opt_to_mask ("void");
+        test_mask = this->opt_to_mask (ACE_TEXT("void"));
         if (test_mask == 0)
           return -1;
         this->enable_test (test_mask);
         break;
       case 'o':
         // For backward compatibility
-        test_mask = this->opt_to_mask ("one_way");
+        test_mask = this->opt_to_mask (ACE_TEXT("one_way"));
         if (test_mask == 0)
           return -1;
         this->enable_test (test_mask);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 3a1f8296c5e..0c969d01ac9 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -60,7 +60,7 @@ private:
   // Simple function that returns the substraction of 117 from the
   // parameter.
 
-  int read_ior (const char *filename);
+  int read_ior (const ACE_TCHAR *filename);
   // Function to read the cubit factory ior from a file.
 
   int parse_args (void);
@@ -130,7 +130,7 @@ private:
   ACE_TCHAR **argv_;
   // arguments from command line.
 
-  char *cubit_factory_key_;
+  ACE_TCHAR *cubit_factory_key_;
   // Key of factory obj ref.
 
   u_int loop_count_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 97fb1bdaf21..c97412958cf 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -45,7 +45,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   if (cubit_client.init (argc, argv) == -1)
     return 1;
 
-  int retval = cubit_client.run ();
+  int const retval = cubit_client.run ();
 
   ACE_TIMEPROBE_PRINT;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index eb062dfc394..caafb40c1cb 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -19,7 +19,6 @@
 
 #include "tao/Strategies/advanced_resource.h"
 
-
 ACE_RCSID(IDL_Cubit, server, "$Id$")
 
 // This runs the server test.
@@ -53,9 +52,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               "\n\tIDL_Cubit: server\n\n"));
   try
     {
-      int ret = cubit_server.init (argc, argv);
-
-      if (ret == -1)
+      if (cubit_server.init (argc, argv)== -1)
         return -1;
 
       cubit_server.run ();