7 files changed, 16 insertions, 16 deletions

diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
index ea42b616bdb..3126bd31074 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
@@ -22,9 +22,9 @@ class ClientApp
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
-    ACE_CString ior_;
+    ACE_TString ior_;
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 };
 
 #endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
index d47ceaf17ee..dd808cd767f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS.h"
 
 
-FooServantList::FooServantList(const char* prefix,
+FooServantList::FooServantList(const ACE_TCHAR* prefix,
                                unsigned    num_servants,
                                unsigned    num_clients,
                                CORBA::ORB_ptr orb)
@@ -29,14 +29,14 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa)
 {
   for (unsigned i = 0; i < this->num_servants_; i++)
     {
-      char buf[32];
-      ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString servant_name = this->prefix_ + "_" + buf;
+      ACE_TCHAR buf[32];
+      ACE_OS::sprintf(buf, ACE_TEXT("%02d"), i + 1);
+      ACE_TString servant_name = this->prefix_ + ACE_TEXT("_") + buf;
 
       this->servants_[i] = new Foo_i(servant_name.c_str(),this);
 
       PortableServer::ObjectId_var id =
-                    PortableServer::string_to_ObjectId(servant_name.c_str());
+                    PortableServer::string_to_ObjectId(ACE_TEXT_ALWAYS_CHAR(servant_name.c_str()));
 
       poa->activate_object_with_id(id.in(),
                                    this->servants_[i].in());
@@ -54,7 +54,7 @@ FooServantList::create_and_activate(PortableServer::POA_ptr poa)
       CORBA::String_var ior
         = this->orb_->object_to_string(obj.in());
 
-      ACE_CString filename = servant_name + ".ior";
+      ACE_TString filename = servant_name + ACE_TEXT(".ior");
       FILE* ior_file = ACE_OS::fopen(filename.c_str(), "w");
 
       if (ior_file == 0)
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
index 3fd17c54093..4526211d80a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
@@ -12,7 +12,7 @@ class FooServantList
 {
   public:
 
-    FooServantList(const char* prefix,
+    FooServantList(const ACE_TCHAR* prefix,
                    unsigned num_servants,
                    unsigned num_clients,
                    CORBA::ORB_ptr orb);
@@ -29,7 +29,7 @@ class FooServantList
     typedef ACE_Guard<LockType> GuardType;
 
     PortableServer::ServantBase_var* servants_;
-    ACE_CString prefix_;
+    ACE_TString prefix_;
     unsigned num_servants_;
 
     LockType num_clients_lock_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index 140f298ef06..95a768fc0c7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -3,7 +3,7 @@
 #include "FooServantList.h"
 #include "ace/OS.h"
 
-Foo_i::Foo_i(const char* servant_name,FooServantList* mgr)
+Foo_i::Foo_i(const ACE_TCHAR* servant_name,FooServantList* mgr)
   : value_(0),
     count_op1_(0),
     count_op2_(0),
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index 695b1219e49..cd448d7c64c 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -13,7 +13,7 @@ class Foo_i : public virtual POA_Foo
 {
   public:
 
-    Foo_i(const char* servant_name, FooServantList* mgr);
+    Foo_i(const ACE_TCHAR* servant_name, FooServantList* mgr);
     virtual ~Foo_i();
 
     virtual void op1(void);
@@ -39,7 +39,7 @@ class Foo_i : public virtual POA_Foo
     unsigned count_op4_;
     unsigned count_op5_;
 
-    ACE_CString     servant_name_;
+    ACE_TString     servant_name_;
     FooServantList* mgr_;
 };
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index 2d83bbe594b..68a5a9caf78 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -12,7 +12,7 @@
 
 
 ServerApp::ServerApp()
-  : ior_filename_("foo"),
+  : ior_filename_(ACE_TEXT("foo")),
     num_servants_(1),
     num_clients_(1)
 {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
index 71cbcb2dd88..8e6e6abdfd4 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
@@ -21,8 +21,8 @@ class ServerApp
     int parse_args(int argc, ACE_TCHAR* argv[]);
     void usage_statement();
 
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_;
+    ACE_TString exe_name_;
+    ACE_TString ior_filename_;
     unsigned    num_servants_;
     unsigned    num_clients_;
 };