15 files changed, 24 insertions, 24 deletions
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index ecbbaa27761..b929abce96a 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -55,8 +55,8 @@ private:
   CORBA::ORB_var orb_;
 
   int argc_;
-  char ** argv_;
-  const char * inFileName_;
+  ACE_TCHAR ** argv_;
+  const ACE_TCHAR * inFileName_;
   FILE *inFile_;
   FILE *commandIn_;
 
@@ -196,7 +196,7 @@ FTClientMain::parse_args (int argc, ACE_TCHAR *argv[])
       }
       case 'f':
       {
-        replica_iors_.push_back(get_opts.opt_arg ());
+        replica_iors_.push_back(ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()));
         break;
       }
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 8645266cdb2..f8de0ad8a40 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -52,12 +52,12 @@ FTAPP::FT_Creator::parse_args (int argc, ACE_TCHAR *argv[])
     {
       case 'r':
       {
-        this->create_roles_.push_back (get_opts.opt_arg ());
+        this->create_roles_.push_back (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()));
         break;
       }
       case 'u':
       {
-        this->unregister_roles_.push_back (get_opts.opt_arg ());
+        this->unregister_roles_.push_back (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()));
         break;
       }
       case 'f':
@@ -86,7 +86,7 @@ FTAPP::FT_Creator::parse_args (int argc, ACE_TCHAR *argv[])
 
       case 'p':
       {
-        this->prefix_ = get_opts.opt_arg();
+        this->prefix_ = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg());
         break;
       }
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 76b04e8bb2d..56b9c55e68b 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -69,7 +69,7 @@ namespace FTAPP
 
     TAO::Object_Group_Creator creator_;
     CORBA::ORB_var orb_;
-    const char * registry_ior_;
+    const ACE_TCHAR * registry_ior_;
     StringVec create_roles_;
     StringVec unregister_roles_;
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index bb4aedec65c..81455a3f63d 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -158,7 +158,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior)
 //////////////////////////////////////////////////////
 // FT_ReplicaFactory_i public, non-CORBA methods
 
-int FT_ReplicaFactory_i::parse_args (int argc, char * argv[])
+int FT_ReplicaFactory_i::parse_args (int argc, ACE_TCHAR * argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:n:f:i:l:t:qu"));
   int c;
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 627bc9ceec4..fec1751af4b 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -67,7 +67,7 @@ public:
    * @param argv traditional C argv
    * @return zero for success; nonzero is process return code for failure.
    */
-  int parse_args (int argc, char * argv[]);
+  int parse_args (int argc, ACE_TCHAR * argv[]);
 
   /**
    * Initialize this object.
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index b6756819aa1..46b3c18c63c 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -35,7 +35,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const
 }
 
 
-int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[])
+int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, ACE_TCHAR * argv[])
 {
   int optionError = 0;
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:"));
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index de87010da8e..89f1395931f 100644
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -38,7 +38,7 @@ public:
   /**
    * Parse command line arguments.
    */
-  int parse_args (int argc, char * argv[]);
+  int parse_args (int argc, ACE_TCHAR * argv[]);
 
   /**
    * Initialize this object
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 34065840e40..70ccfbf26f6 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -17,7 +17,7 @@ StubBatchConsumer::~StubBatchConsumer ()
 }
 
 
-int StubBatchConsumer::parse_args (int argc, char * argv[])
+int StubBatchConsumer::parse_args (int argc, ACE_TCHAR * argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index 2712f5bbdf3..e38d27d010e 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -44,7 +44,7 @@ public:
   /**
    * Parse command line arguments.
    */
-  int parse_args (int argc, char * argv[]);
+  int parse_args (int argc, ACE_TCHAR * argv[]);
 
   /**
    * Publish this objects IOR.
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index dbbacfefea1..5d123ccb437 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -22,7 +22,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer ()
 }
 
 
-int StubFaultAnalyzer::parse_args (int argc, char * argv[])
+int StubFaultAnalyzer::parse_args (int argc, ACE_TCHAR * argv[])
 {
   int optionError = 0;
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:"));
@@ -33,7 +33,7 @@ int StubFaultAnalyzer::parse_args (int argc, char * argv[])
     {
       case 'r':
       {
-        this->replicaIORs.push_back (get_opts.opt_arg ());
+        this->replicaIORs.push_back (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()));
         break;
       }
       case 'd':
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index eec5a427da0..5ec22256ee1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -43,7 +43,7 @@ public:
   /**
    * Parse command line arguments.
    */
-  int parse_args (int argc, char * argv[]);
+  int parse_args (int argc, ACE_TCHAR * argv[]);
 
   /**
    * Initialize this object
@@ -71,7 +71,7 @@ public:
   /////////////////
   // Implementation
 private:
-  int readIORFile(const char * fileName, CORBA::String_var & ior);
+  int readIORFile(const ACE_TCHAR * fileName, CORBA::String_var & ior);
 
   ///////////////
   // Data Members
@@ -99,19 +99,19 @@ private:
   /**
    * a file to write to to signal "ready"
    */
-  const char * readyFile_;
+  const ACE_TCHAR * readyFile_;
 
   /**
    * The detecor's IOR  (-d option)
    */
-  const char * detector_ior_;
+  const ACE_TCHAR * detector_ior_;
 
   ::FT::FaultDetectorFactory_var factory_;
 
   /**
    * The notifier's IOR (-n option)
    */
-  const char * notifier_ior_;
+  const ACE_TCHAR * notifier_ior_;
 
   ::FT::FaultNotifier_var notifier_;
 
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index c46b4459b51..2aa86ed70b9 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -33,7 +33,7 @@ size_t StubFaultConsumer::notifications () const
 }
 
 
-int StubFaultConsumer::parse_args (int argc, char * argv[])
+int StubFaultConsumer::parse_args (int argc, ACE_TCHAR * argv[])
 {
   int optionError = 0;
 #ifndef NO_ARGS_FOR_NOW
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 89a59f19b28..67f4f0dea81 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -46,7 +46,7 @@ public:
   /**
    * Parse command line arguments.
    */
-  int parse_args (int argc, char * argv[]);
+  int parse_args (int argc, ACE_TCHAR * argv[]);
 
   /**
    * Publish this objects IOR.
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 944a2f59b68..a2182b085e1 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -32,7 +32,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const
   return this->object_id_.in();
 }
 
-int StubFaultNotifier::parse_args (int argc, char * argv[])
+int StubFaultNotifier::parse_args (int argc, ACE_TCHAR * argv[])
 {
   int optionError = 0;
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:r:d:n:"));
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 5b336720dd1..4bf155d7beb 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -43,7 +43,7 @@ public:
   /**
    * Parse command line arguments.
    */
-  int parse_args (int argc, char * argv[]);
+  int parse_args (int argc, ACE_TCHAR * argv[]);
 
   /**
    * Initialize.