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

8 files changed, 19 insertions, 25 deletions

diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index aa1359906aa..03b0b5e480f 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -27,11 +27,11 @@ AMH_Servant::~AMH_Servant (void)
 }
 
 int
-AMH_Servant::parse_args (int &argc, char **argv)
+AMH_Servant::parse_args (int &argc, ACE_TCHAR **argv)
 {
   // *** To get correct behaviour, SET POSIXLY_CORECT=1 on Linux
   // systems!!! ***
-  ACE_Get_Opt get_opts (argc, argv, "s:");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("s:"));
   int c;
 
   int count_argv = 0;
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
index ea66a38b1b9..c70e69c2704 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h
@@ -30,7 +30,7 @@ public:
   virtual ~AMH_Servant (void);
 
   /// parse arguments from command line for sleep time
-  virtual int parse_args (int& argc, char **argv);
+  virtual int parse_args (int &argc, ACE_TCHAR **argv);
 
   // = The skeleton methods
   virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 4d93a959480..35d7a355491 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -13,7 +13,7 @@
 # include "Base_Server.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Server::Base_Server (int& argc, char **argv)
+Base_Server::Base_Server (int &argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
   , ior_output_file_ ("test.ior")
@@ -40,7 +40,7 @@ Base_Server::parse_args (void)
 {
   // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux
   // systems!!! ***
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "o:");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("o:"));
   int c;
   int count_argv = 0;
 
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index bbf8bfdb20c..d02bb1dbc11 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -35,7 +35,7 @@ class AMH_Servant;
 class Base_Server
 {
 public:
-  Base_Server (int &argc, char **argv);
+  Base_Server (int &argc, ACE_TCHAR **argv);
 
   //    Is there any reason to make the destructor virtual?  Will you
   //    ever be destroying a derived class through a pointer to
@@ -69,7 +69,7 @@ public:
   // @@ Mayur, please put inlined methods in a separate `.inl' file,
   //    as detailed in the ACE/TAO coding/style guidelines, and as per
   //    our conventions.
-  // Mayur: A seperate file for just one method? AAAGH. OK.  
+  // Mayur: A seperate file for just one method? AAAGH. OK.
 
   /// Accesor method (for servants) to the initialised ORB
   CORBA::ORB_ptr orb (void);
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index 6c4a6ceed3d..67337fa700c 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -11,7 +11,7 @@
 #include "ace/Stats.h"
 #include "ace/Throughput_Stats.h"
 
-Client_Task::Client_Task (int &argc, char **argv)
+Client_Task::Client_Task (int &argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
   , ior_ ("file://test.ior")
@@ -22,7 +22,7 @@ Client_Task::Client_Task (int &argc, char **argv)
 int
 Client_Task::parse_args (void)
 {
-    ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:");
+    ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("k:n:"));
     int c;
 
     while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h
index a3b9f23567c..0b90b3df077 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.h
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.h
@@ -30,7 +30,7 @@ class Client_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Client_Task (int &argc, char ** argv);
+  Client_Task (int &argc, ACE_TCHAR **argv);
 
   int parse_args (void);
 
@@ -58,7 +58,7 @@ private:
   ACE_Basic_Stats latency_;
 
   int &argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   const char *ior_;
   int iterations_;
 };
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index 43ef2b385cc..751ea04c3bc 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -8,12 +8,12 @@
 #include "ace/Task.h"
 #include "ace/Get_Opt.h"
 
-MT_AMH_Server::MT_AMH_Server (int& argc, char **argv)
-  : Base_Server (argc, argv) 
+MT_AMH_Server::MT_AMH_Server (int &argc, ACE_TCHAR **argv)
+  : Base_Server (argc, argv)
 {
 }
 
-MT_AMH_Server::~MT_AMH_Server (void) 
+MT_AMH_Server::~MT_AMH_Server (void)
 {
 }
 
@@ -34,7 +34,7 @@ MT_AMH_Server::usage (const char *message)
 }
 
 
-int 
+int
 MT_AMH_Server::parse_args (void)
 {
 
@@ -45,7 +45,7 @@ MT_AMH_Server::parse_args (void)
       ACE_OS::exit (1);
     }
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "n:");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("n:"));
   int c;
   int count_argv = 0;
 
@@ -79,7 +79,7 @@ MT_AMH_Server::parse_args (void)
   return 0;
 }
 
-void 
+void
 MT_AMH_Server::start_threads (void)
 {
   // Each of this thread runs the event loop
@@ -87,7 +87,7 @@ MT_AMH_Server::start_threads (void)
   this->thr_mgr ()->wait ();
 }
 
-int 
+int
 MT_AMH_Server::svc (void)
 {
   run_event_loop ();
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
index 0bf893fa428..5738bff4d1e 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.h
@@ -26,13 +26,7 @@ class MT_AMH_Server
   , public ACE_Task_Base
 {
 public:
-  // @@ Mayur, have you considered passing in argc by reference
-  //    instead of as a pointer?  It would save you the indirection
-  //    code in below, and make the code cleaner.  This is what
-  //    ORB_init() does.  Not a big deal in any case.
-  //
-  // Mayur: Nice point. Done.
-  MT_AMH_Server (int& argc, char **argv);
+  MT_AMH_Server (int &argc, ACE_TCHAR **argv);
 
   ~MT_AMH_Server (void);