Mon Sep 29 07:37:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

23 files changed, 52 insertions, 26 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 81447c2a7cf..abd54eae170 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,29 @@
+Mon Sep 29 07:37:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMH/Sink_Server/Base_Server.h
+        * examples/Callback_Quoter/Consumer_Handler.cpp
+        * examples/Callback_Quoter/Consumer_Handler.h
+        * examples/Callback_Quoter/Notifier_Input_Handler.h
+        * examples/Callback_Quoter/Supplier_i.cpp
+        * examples/Callback_Quoter/Supplier_i.h
+        * examples/Logging/Logging_Service_i.h
+        * examples/Logging/Logging_Test_i.h
+        * examples/mfc/server.cpp
+        * examples/OBV/Simple_util.cpp
+        * examples/OBV/Simple_util.h
+        * examples/Persistent_Grid/Simple_util.cpp
+        * examples/Persistent_Grid/Simple_util.h
+        * examples/Quoter/client.h
+        * examples/Quoter/Factory_Finder.h
+        * examples/Quoter/Generic_Factory.h
+        * examples/Quoter/server.h
+        * examples/Simple/Simple_util.cpp
+        * examples/Simple/Simple_util.h
+        * examples/Simulator/Event_Supplier/DualEC_Sup.h
+        * examples/Simulator/Event_Supplier/Event_Sup.h
+        * examples/Simulator/Event_Supplier/Logging_Sup.h
+          ACE_TCHAR changes
+
 Mon Sep 29 07:33:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/AMH_Exceptions/server.cpp
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index d02bb1dbc11..ddef8330cb2 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -76,7 +76,7 @@ public:
 
 protected:
   int &argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   const char *ior_output_file_;
   CORBA::ORB_var orb_;
   PortableServer::POA_var root_poa_;
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index b745372624c..8871e69fb2f 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -196,7 +196,7 @@ Consumer_Handler::via_naming_service (void)
 
 // Init function.
 int
-Consumer_Handler::init (int argc, char **argv)
+Consumer_Handler::init (int argc, ACE_TCHAR **argv)
 {
 
   this->argc_ = argc;
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index ebd8581071e..4f646d3d18c 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -108,7 +108,7 @@ private:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *ior_;
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 7ee23aea677..20c3f5e6f82 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -72,7 +72,7 @@ private:
   int argc_;
   // Number of command line arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // The command line arguments.
 
   CosNaming::NamingContext_var naming_context_;
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index e6d6b53a9ea..88bbe57e145 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -250,7 +250,7 @@ Supplier::via_naming_service (void)
 // Init function.
 
 int
-Supplier::init (int argc, char **argv)
+Supplier::init (int argc, ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h
index 2753e58c776..2255cdde258 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.h
+++ b/TAO/examples/Callback_Quoter/Supplier_i.h
@@ -84,7 +84,7 @@ private:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *ior_;
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index 206038d986d..6b9c07532f0 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -57,7 +57,7 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR **argv);
   // Initialize the Logger_Server state - parsing arguments and ...
 
   int run (void);
@@ -90,7 +90,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   char* service_name_;
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 326b1a6cabf..ced9e36d3ff 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -53,7 +53,7 @@ public:
   ~Logger_Client (void);
   // Destructor.
 
-  int init (int argc, char **argv);
+  int init (int argc, ACE_TCHAR **argv);
   // Initialize the client communication endpoint with server.
 
   int run (void);
@@ -87,7 +87,7 @@ private:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   Logger_Factory_var factory_;
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 29fb398e8fb..d76ae4a07f1 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -228,7 +228,7 @@ Client<InterfaceObj, Var>::~Client (void)
 template <class InterfaceObj, class Var> int
 Client<InterfaceObj, Var>::init (const char *name,
                                  int argc,
-                                 char **argv)
+                                 ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 7593150f676..98d1f5f3fea 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -136,7 +136,7 @@ protected:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *ior_;
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index 80309766caa..3d768c3a688 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -234,7 +234,7 @@ Client<InterfaceObj, Var>::~Client (void)
 template <class InterfaceObj, class Var> int
 Client<InterfaceObj, Var>::init (const char * /*name*/,
                                  int argc,
-                                 char **argv)
+                                 ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index 6b2cdf92d33..7de469e469e 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -80,7 +80,7 @@ public:
   int argc_;
   // Number of command line arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // The command line arguments.
 
 };
@@ -135,7 +135,7 @@ protected:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *ior_;
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 10a8af781c0..38e6487e7ce 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -59,7 +59,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   int debug_level_;
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 3ffc00d50f8..4bcd9b1b21c 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -60,7 +60,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   unsigned char use_LifeCycle_Service_;
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 814052d19ba..d740c0860a8 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -64,7 +64,7 @@ private:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *quoter_factory_key_;
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index ad2949cf7a1..47fea991e79 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -81,7 +81,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   int debug_level_;
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 3f1d450c925..3b7bf36289a 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -356,7 +356,7 @@ Client<INTERFACE_OBJECT, Var>::~Client (void)
 template <class INTERFACE_OBJECT, class Var> int
 Client<INTERFACE_OBJECT, Var>::init (const char *name,
                                  int argc,
-                                 char **argv)
+                                 ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 6c43056c84d..a03e5d8fe1d 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -91,7 +91,7 @@ protected:
   int argc_;
   // Number of command line arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // The command line arguments.
 };
 
@@ -146,7 +146,7 @@ protected:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *ior_;
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index cb6f64519f6..12431e57acd 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -172,7 +172,7 @@ private:
   ACE_Unbounded_Queue<Weapons *> weapons_data_;
 
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   long total_messages_;
   long break_count_;
   char *input_file_name_;
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
index 1b56d50d96a..a581635ca41 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h
@@ -71,7 +71,7 @@ private:
   Weapons weapons_;
 
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   unsigned long total_messages_;
   char *input_file_name_;
 };
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
index 80ec077b833..46dfe30d263 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h
@@ -75,7 +75,7 @@ private:
   Weapons weapons_;
 
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   unsigned long total_messages_;
   char *input_file_name_;
   unsigned long update_data_;
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 8f9e8658e9a..15304d7172a 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -100,7 +100,7 @@ CServerApp::~CServerApp()
       CORBA::ORB_var the_shutdown_orb;
 
       int argc = 0;
-      char **argv = 0;
+      ACE_TCHAR **argv = 0;
       const ACE_TCHAR *orb_name = ACE_TEXT("");
 
       // Retrieving a reference to the ORB used inside the thread