*** empty log message ***

85 files changed, 335 insertions, 193 deletions

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index c593fa07e26..be9ebfc1a76 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -4,6 +4,7 @@
 #include "CosEventChannelFactoryC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 class FactoryClient
 {
@@ -21,7 +22,7 @@ public:
   virtual ~FactoryClient (void);
   // destructor.
 
-  void init_ORB (int argc, char *argv[]) ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
@@ -87,7 +88,7 @@ FactoryClient::~FactoryClient (void)
 
 void
 FactoryClient::init_ORB (int argc,
-                       char *argv[])
+                       char *argv[]
                        ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -366,14 +367,15 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG,
               "The FactoryClient will test the Cos Event Channel Factory\n"));
   ACE_TRY_NEW_ENV
     {
       FactoryClient ft;
 
-      ft.init_ORB (argc,
-                   argv
+      ft.init_ORB (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index 7f9e82ff06b..50a842d3f74 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -19,7 +19,7 @@ FactoryDriver::~FactoryDriver (void)
 }
 
 int
-FactoryDriver::parse_args (int argc, ACE_TCHAR *argv[])
+FactoryDriver::parse_args (int argc, char *argv[])
 {
   ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dr:");
   int c = 0;
@@ -50,7 +50,7 @@ FactoryDriver::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 int
-FactoryDriver::start (int argc, ACE_TCHAR *argv[])
+FactoryDriver::start (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
index 26095cf9381..adec5218b49 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
@@ -45,14 +45,14 @@ class FactoryDriver
   ~FactoryDriver (void);
   // Destructor.
 
-  int start (int argc, ACE_TCHAR *argv[]);
+  int start (int argc, char *argv[]);
   // Start the driver.
 
   int stop (void);
   //Stop the driver.
 
  protected:
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parse the command-line arguments and set options.
 
   const char* factoryName_;
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
index 9be56711192..c2b9a007fbc 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
@@ -3,12 +3,15 @@
 
 #include "FactoryDriver.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
   FactoryDriver driver;
-  driver.start (argc, argv);
+  driver.start (convert.get_argc(), convert.get_ASCII_argv());
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 36be143c7c5..cba856ea3b0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -3,6 +3,7 @@
 #include "RtEC_Based_CosEC.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 RtEC_Based_CosEC::RtEC_Based_CosEC (void)
   : service_name ("CosEventService"),
@@ -18,7 +19,7 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
 }
 
 void
-RtEC_Based_CosEC::init_ORB  (int& argc, char *argv[])
+RtEC_Based_CosEC::init_ORB  (int& argc, char *argv[]
                              ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -46,7 +47,7 @@ RtEC_Based_CosEC::init_ORB  (int& argc, char *argv[])
 }
 
 int
-RtEC_Based_CosEC::parse_args (int argc, ACE_TCHAR *argv[])
+RtEC_Based_CosEC::parse_args (int argc, char *argv[])
 {
   ACE_Get_Arg_Opt<char> get_opt (argc, argv, "t:n:e:o:p:r");
   int opt;
@@ -278,14 +279,15 @@ RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   RtEC_Based_CosEC service;
 
   ACE_TRY_NEW_ENV
     {
-      service.startup (argc,
-                       argv
+      service.startup (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index c40e34781a9..eb9333093c4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -40,7 +40,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   virtual ~RtEC_Based_CosEC (void);
   // Destructor.
 
-  int parse_args (int argc, ACE_TCHAR *argv[]);
+  int parse_args (int argc, char *argv[]);
   // Parses the command line arguments.
 
   void startup (int argc, char *argv[]
@@ -68,7 +68,7 @@ protected:
   virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivates the rtec.
 
-  void init_ORB (int& argc, char *argv[])
+  void init_ORB (int& argc, char *argv[]
                  ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index d00beaf427a..976da8ab3b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -3,16 +3,19 @@
 
 #include "Basic.h"
 #include "CosEvent_Utilities.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Basic basic;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      basic.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      basic.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       basic.run (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -61,7 +64,7 @@ Basic::init (int argc, char *argv[]
 }
 
 void
-Basic::init_ORB  (int argc, char *argv[])
+Basic::init_ORB  (int argc, char *argv[]
                         ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index c00d677d819..1f6d6b73702 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -3,6 +3,7 @@
 
 #include "Consumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 Consumer::Consumer ()
   :event_count_ (1)
@@ -11,7 +12,7 @@ Consumer::Consumer ()
 }
 
 int
-Consumer::parse_args (int argc, ACE_TCHAR *argv[])
+Consumer::parse_args (int argc, char *argv[])
 {
  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:");
   int opt;
@@ -178,9 +179,11 @@ Consumer::init_Consumer (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer cons;
 
-  if (cons.init (argc, argv) == -1)
+  if (cons.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   if (cons.init_Consumer () == -1)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index 58fb13a4515..651d825a153 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -69,7 +69,7 @@ public:
   // disconnect the consumer from the EC.
 
   // = CosEC_Multiple methods.
-  virtual int parse_args (int argc, ACE_TCHAR *argv[]);
+  virtual int parse_args (int argc, char *argv[]);
   // Parse the command line options.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 0b47a7dabab..a67007ededc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -37,7 +37,7 @@ Multiple::init (int argc, char *argv[])
 }
 
 int
-Multiple::init_ORB  (int argc, char *argv[]))
+Multiple::init_ORB  (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index 18e8fce3528..e0bca0efa5c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -50,7 +50,7 @@ class Multiple
   // Closes down the ORB and exits.
 
  protected:
-  virtual int parse_args (int argc, ACE_TCHAR *argv[]) = 0;
+  virtual int parse_args (int argc, char *argv[]) = 0;
   // Parse the command line arguments.
 
   CosEventChannelAdmin::EventChannel_ptr cos_ec_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 048a5442d15..0b232a783d4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -3,6 +3,7 @@
 
 #include "Supplier.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 Supplier::Supplier ()
   : event_count_ (1)
@@ -11,7 +12,7 @@ Supplier::Supplier ()
 }
 
 int
-Supplier::parse_args (int argc, ACE_TCHAR *argv[])
+Supplier::parse_args (int argc, char *argv[])
 {
   ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:");
   int opt;
@@ -172,9 +173,11 @@ Supplier::run (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supp;
 
-  if (supp.init (argc, argv) == -1)
+  if (supp.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   supp.run ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index b274f0b2c1a..9ef552599ce 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -63,7 +63,7 @@ public:
   // Sends the events to the EC.
 
   // = Multiple methods.
-  virtual int parse_args (int argc, ACE_TCHAR *argv[]);
+  virtual int parse_args (int argc, char *argv[]);
   // Parses the command line arguments.
 private:
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index 4d32b016f36..359f25fddcb 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -2,6 +2,7 @@
 
 #include "Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Examples,
            Consumer,
@@ -10,9 +11,11 @@ ACE_RCSID (CosEC_Examples,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -23,7 +26,7 @@ Consumer::Consumer (void)
 }
 
 int
-Consumer::run (int argc, ACE_TCHAR* argv[])
+Consumer::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 1367e2540ac..7156353e483 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -35,7 +35,7 @@ public:
   Consumer (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The CosEventComm::PushConsumer methods
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 3231e24f3bd..cf07d735aea 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Simple,
            Service,
@@ -16,6 +17,8 @@ int parse_args (int argc, char *argv[]);
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -23,10 +26,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-o IOR_file_name]\n"));
@@ -65,7 +68,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 194e6691c4f..490ab33bf75 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -3,6 +3,7 @@
 #include "Supplier.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Examples,
            Supplier,
@@ -11,9 +12,11 @@ ACE_RCSID (CosEC_Examples,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -23,7 +26,7 @@ Supplier::Supplier (void)
 }
 
 int
-Supplier::run (int argc, ACE_TCHAR* argv[])
+Supplier::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 4cfb02357d7..4fdc39bfa08 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -35,7 +35,7 @@ public:
   Supplier (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The CosEventComm::PushSupplier methods
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index 230991db3df..1143417a9f0 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosTypedEventChannelAdminC.h"
 #include "Country_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Examples, 
            Consumer, 
@@ -12,13 +13,14 @@ ACE_RCSID (CosEC_Examples,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_obj =
@@ -79,8 +81,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       const char* ior_file_name = "Consumer.ior";
       FILE *output_file=
-	ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(ior_file_name),
-		       ACE_TEXT("w"));
+	ACE_OS::fopen (ior_file_name, ACE_TEXT("w"));
       if (output_file == 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   "Cannot open output file for writing IOR: %s",
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index 715896fc838..c61ee91be55 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -3,19 +3,21 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/CosTypedEventChannelAdminC.h"
 #include "CountryC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(CosEC_Examples, Supplier, "$Id:")
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the event channel using the Naming Service.
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index 76a41958fa8..5e9e7766033 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 // IOR manipulation.
 #include "tao/IORManipulation/IORManip_Loader.h"
@@ -43,18 +44,19 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0) return -1;
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1;
 
       // Start out with the first IOR.  Interaction with the second
       // IOR occurs during the various interceptions executed during
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 42ea3a24a87..359851764ec 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -9,6 +9,7 @@
 #include "CrashPoint.h"
 #include "ORB_Initializer.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_file = 0;
 
@@ -42,10 +43,12 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      if (::parse_args (argc, argv) != 0) return -1;
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1;
 
       ORB_Initializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -60,7 +63,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -101,7 +104,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       if (output_file == 0)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
index 43874f66c16..4b0ec533a33 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -12,7 +12,7 @@
 
 using std::string;
 
-TestClient::TestClient(CORBA::ORB_ptr orb, int argc, ACE_TCHAR* argv[])
+TestClient::TestClient(CORBA::ORB_ptr orb, int argc, char* argv[])
 : orb_(CORBA::ORB::_duplicate(orb))
 , pauseType_('s')
 , startupPause_(0)
@@ -32,7 +32,7 @@ TestClient::~TestClient()
 {
 }
 
-int TestClient::parseCommands(int argc, ACE_TCHAR* argv[])
+int TestClient::parseCommands(int argc, char* argv[])
 {
   ACE_Get_Arg_Opt<char> get_opts(argc, argv, "s:t:i:r:x:e:z:");
   int c;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
index c698cbe2802..d2f989111cc 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
@@ -9,14 +9,14 @@
 class TestClient : public ACE_Task_Base
 {
 public:
-  TestClient(CORBA::ORB_ptr orb, int argc, ACE_TCHAR* argv[]);
+  TestClient(CORBA::ORB_ptr orb, int argc, char* argv[]);
 
   virtual ~TestClient();
 
   void run();
 
 private:
-  int parseCommands(int argc, ACE_TCHAR* argv[]);
+  int parseCommands(int argc, char* argv[]);
   void buildIORList();
   void pause(int milliseconds);
   virtual int svc();
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index 1c48b4508ad..cb83d318cb1 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -123,7 +123,7 @@ string normalizePath(const string& dir, char delim, bool toLower)
   return string(buffer);
 }
 
-TestServer::TestServer(CORBA::ORB_ptr orb, int argc, ACE_TCHAR* argv[])
+TestServer::TestServer(CORBA::ORB_ptr orb, int argc, char* argv[])
 : serverID_(1)
 , serverInstanceID_(-1)
 , useIORTable_(false)
@@ -162,7 +162,7 @@ TestServer::~TestServer()
 //  TestServer::parseCommands
 //  Reads params from command line
 //
-int TestServer::parseCommands(int argc, ACE_TCHAR* argv[])
+int TestServer::parseCommands(int argc, char* argv[])
 {
   ACE_Get_Arg_Opt<char> get_opts(argc, argv, "w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:");
   int c;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
index ec448b86996..d18bd441c6b 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.h
@@ -11,14 +11,14 @@
 class TestServer
 {
 public:
-  TestServer(CORBA::ORB_ptr, int argc, ACE_TCHAR* argv[]);
+  TestServer(CORBA::ORB_ptr, int argc, char* argv[]);
 
   ~TestServer();
 
   void run();
 
 private:
-  int parseCommands(int argc, ACE_TCHAR* argv[]);
+  int parseCommands(int argc, char* argv[]);
   bool verifyEnvironment() const;
   bool registerWithManager();
   void buildObjects();
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
index 838528509e6..3714c16935c 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
@@ -2,15 +2,18 @@
 #include "TestClient.h"
 
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
 int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
   {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     {
-      TestClient client(orb.in(), argc, argv);
+      TestClient client(orb.in(), convert.get_argc(), convert.get_ASCII_argv());
       client.run();
     }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
index e3f33a52784..71611cb17b9 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
@@ -3,15 +3,18 @@
 
 #include <ace/Get_Opt.h>
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
 int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
   {
     long retryCount = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
-    ACE_Get_Arg_Opt<char> get_opts(argc, argv, "r:");
+    ACE_Get_Arg_Opt<char> get_opts(convert.get_argc(), convert.get_ASCII_argv(), "r:");
     int c;
     while ((c = get_opts()) != -1)
     {
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
index 7b793e29b11..8ebf26df60d 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
@@ -2,16 +2,19 @@
 #include "TestServer.h"
 
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
 int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
   {
     CORBA::ORB_var orb;
-    orb = CORBA::ORB_init(argc, argv);
+    orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     {
-      TestServer server(orb.in(), argc, argv);
+      TestServer server(orb.in(), convert.get_argc(), convert.get_ASCII_argv());
       server.run();
     }
 
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 86d3d9884d5..618fb276e2f 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -8,7 +8,7 @@
 #include "ace/Service_Config.h"
 #include "ace/streams.h"
 #include "ace/OS_NS_string.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 using namespace PortableServer;
@@ -27,7 +27,7 @@ public:
   {
     ACE_ASSERT(s != 0);
     ACE_ASSERT(ACE_OS::strlen(s) > 0);
-    return asc_.process_directive(s);
+    return asc_.process_directive(ACE_TEXT_TO_TCHAR_IN(s));
   }
 
   virtual void reconfigure() ACE_THROW_SPEC ((CORBA::SystemException))
@@ -38,12 +38,14 @@ public:
 
 int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try {
 
     ACE_Service_Config config;
     config.open(argc, argv);
 
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     Object_var obj = orb->resolve_initial_references("RootPOA");
     POA_var poa = POA::_narrow(obj.in());
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index ee228ef11f1..8e2558f12c3 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -6,6 +6,7 @@
 #include <ace/streams.h>
 #include <ace/SString.h>
 #include <ace/Log_Msg.h>
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 
@@ -18,7 +19,7 @@ namespace {
       "(e.g. dynamic mysvc Service_Object * MySvc:_make_MySvc() \"-arg1 one\"\n\n"));
   }
 
-  bool parse_args(int argc, ACE_TCHAR* argv[]) {
+  bool parse_args(int argc, char* argv[]) {
     if (argc != 2 && argc != 3) {
       ACE_ERROR((LM_ERROR, "Controller: wrong number of arguments. %d\n", argc - 1));
       return false;
@@ -39,13 +40,15 @@ namespace {
   }
 }
 
-int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) {
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
+{
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   try {
 
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
-    if (! parse_args(argc, argv)) {
+    if (! parse_args(convert.get_argc(), convert.get_ASCII_argv())) {
       showusage();
       return 1;
     }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 8566023c945..36e08acfd2a 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -63,7 +63,7 @@ DynServer_Loader::DynServer_Loader(void)
 }
 
 int
-DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL)
+DynServer_Loader::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
 {
   try {
 
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index c222ebe531e..9bc066ca4f8 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -31,7 +31,7 @@ public:
 
   // spawns a thread to run an internal orb which has activated
   // a single DynServer servant.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
 
   // Allows the service configurator to shutdown the orb
   virtual int fini (void);
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 0e1c4e20a8c..83ba21920a8 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -7,6 +7,7 @@
 #include "ace/SString.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 #define assertTrue(CONDITION) \
     if (CONDITION == false) { \
@@ -18,11 +19,13 @@
 
 using namespace CORBA;
 
-int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) {
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
+{
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   try {
  
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     Object_var obj = orb->resolve_initial_references("Test");
     test_var test = test::_narrow(obj.in());
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index a07fdeb8a93..d9a7fd6804f 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/streams.h"
 #include "ace/ARGV.h"
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 using namespace PortableServer;
@@ -38,11 +39,13 @@ POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poam
   return poa._retn();
 }
 
-int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) {
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
+{
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   try {
  
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     Object_var obj = orb->resolve_initial_references("RootPOA");
     POA_var root_poa = POA::_narrow(obj.in());
diff --git a/TAO/orbsvcs/examples/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 87bbec1bd86..d2f13bc1206 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -1,7 +1,7 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (LoadBalancing,
            client,
@@ -51,13 +51,15 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 85eb3905859..591da3c57c0 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -3,6 +3,7 @@
 #include "ORBInitializer.h"
 #include "RPS_Monitor.h"
 #include "ace/OS.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "ace/Get_Opt.h"
 
@@ -240,6 +241,8 @@ join_object_group (CORBA::ORB_ptr orb,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       ORBInitializer *initializer = 0;
@@ -254,7 +257,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -277,7 +280,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -328,7 +331,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index ae27e879fbd..288e3c695af 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -25,7 +25,7 @@ TLS_Client::~TLS_Client ()
 }
 
 void
-TLS_Client::init (int argc, char *argv[]) ACE_ENV_ARG_DECL)
+TLS_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -37,7 +37,7 @@ TLS_Client::init (int argc, char *argv[]) ACE_ENV_ARG_DECL)
 
 void
 TLS_Client::init_ORB (int argc,
-                      char *argv[])
+                      char *argv[]
                       ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index 7b6f54ea719..1e9c617cb97 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -31,14 +31,14 @@ class TLS_Client
   TLS_Client (void);
   ~TLS_Client ();
 
-  void init (int argc, ACE_TCHAR *argv[]) ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Init the Client.
 
   void run_tests (ACE_ENV_SINGLE_ARG_DECL);
   // Run the tests..
 
  protected:
-  void init_ORB (int argc, char *argv[]) ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index 3b5098b43ad..33ac63e3a3c 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -1,5 +1,6 @@
 #include "TLS_Client.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Basic,
            main,
@@ -9,11 +10,13 @@ ACE_RCSID (Basic,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TLS_Client client; // Telecom Log Service Client
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 934603b9060..b95683ef2a4 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,6 +1,7 @@
 #include "Event_Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event,
            Event_Consumer,
@@ -12,9 +13,11 @@ ACE_RCSID (Event,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -25,7 +28,7 @@ Consumer::Consumer (void)
 }
 
 int
-Consumer::run (int argc, ACE_TCHAR* argv[])
+Consumer::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 436173abb07..946299dc55d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
@@ -37,7 +37,7 @@ public:
   Consumer (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The CosEventComm::PushConsumer methods
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index fd9bc961787..390fd1eea30 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,6 +1,7 @@
 #include "Event_Supplier.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event,
            Event_Supplier,
@@ -16,9 +17,11 @@ ACE_RCSID (Event,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -28,7 +31,7 @@ Supplier::Supplier (void)
 }
 
 int
-Supplier::run (int argc, ACE_TCHAR* argv[])
+Supplier::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index 071dceab33c..c37b9a5c9df 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
@@ -37,7 +37,7 @@ public:
   Supplier (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The CosEventComm::PushSupplier methods
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 3fd282ae1dd..23db295bd76 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -2,6 +2,7 @@
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify,
            Notify_Consumer,
@@ -20,9 +21,11 @@ ACE_RCSID (Notify,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -33,7 +36,7 @@ Consumer::Consumer (void)
 }
 
 int
-Consumer::run (int argc, ACE_TCHAR* argv[])
+Consumer::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index f60add3b534..0a125e95824 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
@@ -40,7 +40,7 @@ public:
   Consumer (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
 protected:
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index f5d74240275..03ffa87f327 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,6 +1,7 @@
 #include "Notify_Supplier.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify,
            Notify_Supplier,
@@ -20,9 +21,11 @@ ACE_RCSID (Notify,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -37,7 +40,7 @@ Supplier::~Supplier ()
 }
 
 int
-Supplier::run (int argc, ACE_TCHAR* argv[])
+Supplier::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
index a82f3080038..bd4e26f2fda 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h
@@ -44,7 +44,7 @@ public:
   ~Supplier ();
   // Destructor.
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
 private:
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index 8ed78fa74b6..6dff34ef7b7 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -2,6 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (RTEvent,
            RTEvent_Consumer,
@@ -13,9 +14,11 @@ ACE_RCSID (RTEvent,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -26,7 +29,7 @@ Consumer::Consumer (void)
 }
 
 int
-Consumer::run (int argc, ACE_TCHAR* argv[])
+Consumer::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index a8cd55b1f61..5c908495901 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
@@ -38,7 +38,7 @@ public:
   Consumer (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The RtecEventComm::PushConsumer methods
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 56753496d21..7f2286132ff 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (RTEvent,
            RTEvent_Supplier,
@@ -18,9 +19,11 @@ ACE_RCSID (RTEvent,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 
 }
 
@@ -31,7 +34,7 @@ Supplier::Supplier (void)
 }
 
 int
-Supplier::run (int argc, ACE_TCHAR* argv[])
+Supplier::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index d28aa218fbb..170a98db896 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
@@ -38,7 +38,7 @@ public:
   Supplier (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The RtecEventComm::PushSupplier methods
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 0cc9aa1564e..b48d70383aa 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -25,6 +25,7 @@
 // For in-process Notification Service.
 //
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
 
@@ -206,9 +207,11 @@ private:
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    ORB_var orb (ORB_init (argc, argv));
+    ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv()));
 
     if (argc < 2)
     {
@@ -287,7 +290,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     if (argc < 3)
       space_craft_name = "a";  // Default to spacecraft "a".
     else
-      space_craft_name = argv[2];
+      space_craft_name = convert.get_ASCII_argv()[2];
 
     // Do a quick mapping to mcast addresses.
     //
@@ -322,7 +325,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
     // Start the agent.
     //
-    Agent agent (space_craft_name, argv[1], channel.in ());
+    Agent agent (space_craft_name, convert.get_ASCII_argv()[1], channel.in ());
 
     orb->run ();
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 84f2daf1b47..e858f379b04 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -17,6 +17,7 @@
 // For in-process Notification Service.
 //
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
 
@@ -35,9 +36,11 @@ using namespace CosNotifyChannelAdmin;
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    ORB_var orb (ORB_init (argc, argv));
+    ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv()));
 
     if (argc < 2)
     {
@@ -134,7 +137,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     ACE_INET_Addr space_craft_addr;
     char const* space_craft_name = 0;
 
-    space_craft_name = argv[1];
+    space_craft_name = convert.get_ASCII_argv()[1];
 
     // Do a quick mapping to mcast addresses.
     //
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index 0db1b5b248f..b65a677e0b8 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -28,7 +28,7 @@ FilterClient::~FilterClient ()
 }
 
 void
-FilterClient::init (int argc, char *argv[]) ACE_ENV_ARG_DECL)
+FilterClient::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -77,7 +77,7 @@ FilterClient::done (void)
 
 void
 FilterClient::init_ORB (int argc,
-                      char *argv[])
+                      char *argv[]
                       ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index c353aad7f3a..5d767320a86 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -40,7 +40,7 @@ class FilterClient
   ~FilterClient ();
   // Destructor
 
-  void init (int argc, ACE_TCHAR *argv[]) ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Init the Client.
 
   void run (ACE_ENV_SINGLE_ARG_DECL);
@@ -50,7 +50,7 @@ class FilterClient
   // Consumer calls done, We're done.
 
  protected:
-  void init_ORB (int argc, char *argv[]) ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index e52ccf52cbd..0e3641cd299 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -2,15 +2,18 @@
 // $Id$
 
 #include "Filter.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   FilterClient client;
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index b839bf9b59a..fed61e55a87 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -9,6 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$")
 
@@ -26,13 +27,13 @@ TAO_Notify_Lanes_Consumer_Client::~TAO_Notify_Lanes_Consumer_Client ()
 int
 TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LanePriority")))) // LanePriority
+      if ((current_arg = arg_shifter.get_the_parameter ("-LanePriority"))) // LanePriority
         {
           if (current_arg != 0)
             {
@@ -214,11 +215,12 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -232,7 +234,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       TAO_Notify_Lanes_Consumer_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 2ab10ba4205..12dec500064 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -10,6 +10,7 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$")
 
@@ -27,13 +28,13 @@ TAO_Notify_Lanes_Supplier_Client::~TAO_Notify_Lanes_Supplier_Client ()
 int
 TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to.
+      if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to.
         {
           if (current_arg != 0)
             {
@@ -42,7 +43,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to.
+      else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to.
         {
           if (current_arg != 0)
             {
@@ -214,11 +215,12 @@ TAO_Notify_Lanes_Supplier_Client::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -235,7 +237,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       /* Create a Client */
       TAO_Notify_Lanes_Supplier_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 5783fd5636a..a410ae315e7 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -31,7 +31,7 @@ Subscribe::~Subscribe ()
 }
 
 void
-Subscribe::init (int argc, ACE_TCHAR *argv[]) ACE_ENV_ARG_DECL)
+Subscribe::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -73,11 +73,10 @@ Subscribe::done (void)
 
 void
 Subscribe::init_ORB (int argc,
-                      char *argv[])
+                      char *argv[]
                       ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 33f1f9cc963..0c06932cf8f 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -35,7 +35,7 @@ class Subscribe
   Subscribe (void);
   ~Subscribe ();
 
-  void init (int argc, ACE_TCHAR *argv[]) ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Init the Client.
 
   void run (ACE_ENV_SINGLE_ARG_DECL);
@@ -45,7 +45,7 @@ class Subscribe
   // Called when all events we are waiting for have occured.
 
  protected:
-  void init_ORB (int argc, char *argv[]) ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index 639f544d311..392669fbb4e 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -2,15 +2,18 @@
 // $Id$
 
 #include "Subscribe.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Subscribe client;
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 43841e16172..cfed55e07b4 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -9,6 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$")
 
@@ -28,25 +29,25 @@ TAO_Notify_ThreadPool_Consumer_Client::~TAO_Notify_ThreadPool_Consumer_Client ()
 int
 TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxySupplier_ThreadPool")))) // Specify a threadpool.
+      if ((current_arg = arg_shifter.get_the_parameter("-ProxySupplier_ThreadPool"))) // Specify a threadpool.
         {
           this->proxy_supplier_thread_count_ = ACE_OS::atoi (arg_shifter.get_current ());
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events
+      else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events
         {
           this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ());
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-Delay")))) // seconds wait in consumer per push.
+      else if ((current_arg = arg_shifter.get_the_parameter("-Delay"))) // seconds wait in consumer per push.
         {
           this->delay_ = ACE_OS::atoi (current_arg);
 
@@ -217,11 +218,12 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -235,7 +237,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       TAO_Notify_ThreadPool_Consumer_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 2a3914ca05f..9ff3ca8bd3e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -10,6 +10,7 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$")
 
@@ -30,13 +31,13 @@ TAO_Notify_ThreadPool_Supplier_Client::~TAO_Notify_ThreadPool_Supplier_Client ()
 int
 TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to.
+      if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to.
         {
           if (current_arg != 0)
             {
@@ -45,17 +46,17 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-EventChannel_ThreadPool")))) // Specify a threadpool.
+      else if ((current_arg = arg_shifter.get_the_parameter("-EventChannel_ThreadPool"))) // Specify a threadpool.
         {
           this->ec_thread_count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxyConsumer_ThreadPool")))) // Specify a threadpool.
+      else if ((current_arg = arg_shifter.get_the_parameter("-ProxyConsumer_ThreadPool"))) // Specify a threadpool.
         {
           this->proxy_consumer_thread_count_= ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to.
+      else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to.
         {
           if (current_arg != 0)
             {
@@ -64,7 +65,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events
+      else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events
         {
           this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ());
 
@@ -212,11 +213,12 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -233,7 +235,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       /* Create a Client */
       TAO_Notify_ThreadPool_Supplier_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 93ad0c43335..a14758fcaf0 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -2,6 +2,7 @@
 
 #include "sum_serverC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ORT,
            client,
@@ -35,14 +36,17 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb", ACE_TRY_ENV);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 
+                         "client_sum_orb", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index a7960e90978..bc8e494a2c9 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -5,6 +5,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = 0;
 
@@ -36,17 +37,18 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       /// Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "gateway_server_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       /// Resolve reference to RootPOA
@@ -162,7 +164,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       /// If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing "
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index 8c1093e3391..f26e69452d6 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -6,6 +6,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = 0;
 
@@ -37,6 +38,8 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -61,13 +64,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // The usual initialization stuff
 
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "server_sum_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Resolve reference to RootPOA
@@ -124,7 +126,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing "
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index cbd2a3edec7..b4c3bf4efd2 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -7,6 +7,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Consumer,
@@ -20,9 +21,11 @@ static const char* ecname = 0;
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -33,7 +36,7 @@ Consumer::Consumer (void)
 }
 
 int
-Consumer::run (int argc, ACE_TCHAR* argv[])
+Consumer::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -179,7 +182,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
 int
 Consumer::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index bc830e6c5e3..c8268e1c3ea 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
@@ -32,7 +32,7 @@ public:
   Consumer (void);
 
   /// Run the test
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
 
   // = The RtecEventComm::PushConsumer methods
 
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index b55bdcd3a2d..8415251c710 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Event/EC_Gateway.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -18,9 +19,11 @@ static const char* ecname = 0;
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC channel;
 
-  return channel.run (argc, argv);
+  return channel.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -30,7 +33,7 @@ EC::EC (void)
 }
 
 int
-EC::run (int argc, ACE_TCHAR* argv[])
+EC::run (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
@@ -138,7 +141,7 @@ EC::run (int argc, ACE_TCHAR* argv[])
 int
 EC::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
index fbbf257cb47..2734de1dcd0 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
@@ -30,7 +30,7 @@ public:
   EC (void);
 
   /// Run the test
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
 
 private:
   int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index 75df5ba0bac..f7a3bf17e16 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -19,9 +20,11 @@ static const char* consumerec = 0;
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Gateway gateway;
 
-  return gateway.run (argc, argv);
+  return gateway.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -31,7 +34,7 @@ Gateway::Gateway (void)
 }
 
 int
-Gateway::run (int argc, ACE_TCHAR* argv[])
+Gateway::run (int argc, char* argv[])
 {
   TAO_EC_Gateway_IIOP_Factory::init_svcs ();
 
@@ -160,7 +163,7 @@ Gateway::run (int argc, ACE_TCHAR* argv[])
 int
 Gateway::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
index 677b9cbfd4a..6c7d931d988 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
@@ -29,7 +29,7 @@ public:
   Gateway (void);
 
   /// Run the test
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
 
 private:
   int parse_args (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index 68ad2ee497a..3fa33011289 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -8,6 +8,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -21,9 +22,11 @@ static const char* ecname = 0;
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -33,7 +36,7 @@ Supplier::Supplier (void)
 }
 
 int
-Supplier::run (int argc, ACE_TCHAR* argv[])
+Supplier::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -174,7 +177,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 int
 Supplier::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index 2749477d9ad..98e87ec39d2 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
@@ -31,7 +31,7 @@ public:
   Supplier (void);
 
   /// Run the test
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
 
   // = The RtecEventComm::PushSupplier methods
 
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index cd4ff584dbb..21baca54cea 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Sched/Reconfig_Scheduler.h"
 #include "orbsvcs/Runtime_Scheduler.h"
 //#include "orbsvcs/Event/Module_Factory.h"
@@ -44,6 +45,8 @@ typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_M
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   //TAO_EC_Default_Factory::init_svcs ();
 
   TAO_EC_Kokyu_Factory::init_svcs ();
@@ -54,10 +57,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-o IOR_file_name]\n"));
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index f00b6f9e5cf..81bd9b3ab9e 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -14,6 +14,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            MCast,
@@ -27,6 +28,8 @@ int parse_args (int argc, char *argv[]);
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Register the default factory in the Service Configurator.
   // If your platform supports static constructors then you can
   // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO
@@ -49,13 +52,13 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
       // -ORB options from the command line.
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-m udp_mcast_addr]\n"));
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index c4fe34e7609..05e5720ca3e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -15,6 +15,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(EC_Examples, Service, "$Id$")
 
@@ -27,6 +28,8 @@ typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_M
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -34,10 +37,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-o IOR_file_name]\n"));
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index f9db593bc4e..a2cb57cbef6 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/CosNamingC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Consumer,
@@ -12,9 +13,11 @@ ACE_RCSID (EC_Examples,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -25,7 +28,7 @@ Consumer::Consumer (void)
 }
 
 int
-Consumer::run (int argc, ACE_TCHAR* argv[])
+Consumer::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 14604187f23..19005b96ec1 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -36,7 +36,7 @@ public:
   Consumer (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The RtecEventComm::PushConsumer methods
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index 8834ea1de86..5085c1cc50e 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -5,6 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Service,
@@ -17,6 +18,8 @@ int parse_args (int argc, char *argv[]);
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -24,7 +27,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 	  CORBA::Object_var object =
@@ -82,7 +85,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 83d44848b16..af29866c0ec 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -13,9 +14,11 @@ ACE_RCSID (EC_Examples,
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -25,7 +28,7 @@ Supplier::Supplier (void)
 }
 
 int
-Supplier::run (int argc, ACE_TCHAR* argv[])
+Supplier::run (int argc, char* argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index 4acb5c03cc5..b1fce544ccc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -36,7 +36,7 @@ public:
   Supplier (void);
   // Constructor
 
-  int run (int argc, ACE_TCHAR* argv[]);
+  int run (int argc, char* argv[]);
   // Run the test
 
   // = The RtecEventComm::PushSupplier methods
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 4f66f5ffab3..1c930262112 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID(Send_File, client, "$Id$")
@@ -36,13 +37,15 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 472d9c01802..c71c738e8bd 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -4,6 +4,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Send_File, server, "$Id$")
 
@@ -37,10 +38,12 @@ parse_args (int argc, char *argv[])
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -78,7 +81,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",