Tue Sep 16 11:06:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 15 insertions, 15 deletions

diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 9418c3c228b..3f1d450c925 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -34,7 +34,7 @@ Server<Servant>::~Server (void)
 template <class Servant> int
 Server<Servant>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:"));
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -300,7 +300,7 @@ Client<INTERFACE_OBJECT, Var>::read_ior (char *filename)
 template <class INTERFACE_OBJECT, class Var> int
 Client<INTERFACE_OBJECT, Var>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
+  ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x"));
   int c = 0;
   int result = 0;
 
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index d84fe2d98c0..80e38ecea63 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -43,9 +43,9 @@ Client_i::~Client_i (void)
 }
 
 int
-Client_i::parse_args (int argc, char *argv[])
+Client_i::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:f:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("n:f:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index b42c0514823..43fb06d0f30 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -60,7 +60,7 @@ public:
   // Handle the user input.
 
  private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parse the command line arguments.
   // Returns 0 on success, -1 on error.
 
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index 651990e7ebb..d175c3675d0 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -33,9 +33,9 @@ Server_i::~Server_i (void)
 }
 
 int
-Server_i::parse_args (int argc, char *argv[])
+Server_i::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 3a651d95639..4687ae01068 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -46,7 +46,7 @@ public:
  // Run the ORB.
 
 private:
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
   int write_IOR (const char *ior);
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index ae992b80da7..6b4ee9fa20e 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -31,7 +31,7 @@ Grid_Client_i::parse_args (int argc,
                            char *argv[])
 {
   // Parses some of the options that are specific to this example
-  ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:p:q:v:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("df:nk:xw:h:p:q:v:"));
 
   int c = 0;
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h
index cf4cc4336b3..1e5c0e27764 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.h
+++ b/TAO/examples/Simple/grid/Grid_Client_i.h
@@ -14,7 +14,7 @@
 //
 // = AUTHOR
 //   Balachandran Natarajan <bala@cs.wustl.edu>
-//    
+//
 // ============================================================================
 
 #ifndef GRID_CLIENT_I_H
@@ -42,7 +42,7 @@ public:
   virtual int run (const char *, int, char *[]);
   // Execute the methods.
 
-  virtual int parse_args (int argc, char *argv[]);
+  virtual int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
 private:
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 4d2c545d02c..39395737dc9 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -125,9 +125,9 @@ DLL_ORB::fini (void)
 }
 
 int
-Time_Date_Servant::parse_args (int argc, char *argv[])
+Time_Date_Servant::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dn:o:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dn:o:"));
   int c = 0;
 
   this->orb_ = "ORB";
diff --git a/TAO/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h
index 2165fddf4f3..623049ff234 100644
--- a/TAO/examples/Simple/time-date/Time_Date.h
+++ b/TAO/examples/Simple/time-date/Time_Date.h
@@ -78,7 +78,7 @@ public:
   virtual int init (int argc, char *argv[]);
 
   /// Parse the "command-line" arguments.
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
 
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.h b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
index 1d8e99e7301..52f0e7b0ae6 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
@@ -42,7 +42,7 @@ public:
   virtual int run (const char *, int, char *[]);
   // Execute the methods.
 
-  virtual int parse_args (int argc, char *argv[]);
+  virtual int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
 private: