33 files changed, 61 insertions, 62 deletions

diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 35d7a355491..565a3b1b84b 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -16,7 +16,7 @@
 Base_Server::Base_Server (int &argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
-  , ior_output_file_ ("test.ior")
+  , ior_output_file_ (ACE_TEXT("test.ior"))
 {
 }
 
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index ddef8330cb2..ab0055f94aa 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -77,7 +77,7 @@ public:
 protected:
   int &argc_;
   ACE_TCHAR **argv_;
-  const char *ior_output_file_;
+  const ACE_TCHAR *ior_output_file_;
   CORBA::ORB_var orb_;
   PortableServer::POA_var root_poa_;
 
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index 7f9398bac41..fc3a4ce8f07 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -14,7 +14,7 @@
 Client_Task::Client_Task (int &argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
-  , ior_ ("file://test.ior")
+  , ior_ (ACE_TEXT("file://test.ior"))
   , iterations_ (1000)
 {
 }
@@ -140,7 +140,7 @@ Client_Task::run_test (void)
 
   ACE_Basic_Stats totals;
 
-  this->accumulate_and_dump (totals, "Task", gsf);
+  this->accumulate_and_dump (totals, ACE_TEXT("Task"), gsf);
 
   totals.dump_results (ACE_TEXT("Total"), gsf);
 
@@ -175,7 +175,7 @@ Client_Task::svc (void)
 
 void
 Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
+                                  const ACE_TCHAR *msg,
                                   ACE_UINT32 gsf)
 {
   totals.accumulate (this->latency_);
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h
index eaf54cdbcea..ddd378f8bc0 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.h
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.h
@@ -47,7 +47,7 @@ protected:
 private:
   /// Print Statistics
   void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
+                            const ACE_TCHAR *msg,
                             ACE_UINT32 gsf);
 
 private:
@@ -59,7 +59,7 @@ private:
 
   int &argc_;
   ACE_TCHAR **argv_;
-  const char *ior_;
+  const ACE_TCHAR *ior_;
   int iterations_;
 };
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
index 4ccf3f2360b..059d878bcab 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
@@ -21,9 +21,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/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
index 0f8f66d4642..ef49e94a384 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
@@ -22,8 +22,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_clients_;
 };
 
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_;
 };
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
index ea42b616bdb..3126bd31074 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/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/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 5321824be3e..6cb5f2399b0 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -12,7 +12,7 @@
 
 
 ServerApp::ServerApp()
-  : ior_filename_("ServerApp.default.ior"),
+  : ior_filename_(ACE_TEXT("ServerApp.default.ior")),
     num_clients_(1),
     num_orb_threads_(1)
 {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
index 784157aa878..dc422b926b2 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
@@ -22,8 +22,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_clients_;
     unsigned    num_orb_threads_;
 };
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
index 66258d7d8e9..1a77e8463f7 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
@@ -32,7 +32,7 @@ class ServerApp
       const char* servant_name);
 
 
-    ACE_CString exe_name_;
+    ACE_TString exe_name_;
 
     CORBA::ORB_var orb_;
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
index fd8c49c53f2..2d852a56d1b 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
@@ -23,9 +23,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/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
index 6ec34ef4561..7d38f48fefc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
@@ -7,7 +7,7 @@
 #include "ace/OS.h"
 
 
-FooServantList::FooServantList(const char* prefix,
+FooServantList::FooServantList(const ACE_TCHAR* prefix,
                                unsigned    num_servants,
                                unsigned    num_clients,
                                int         collocated_test,
@@ -43,15 +43,15 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
 
   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);
+      this->servants_[i] = new Foo_i(ACE_TEXT_ALWAYS_CHAR(servant_name.c_str()),this);
       this->safe_servants_[i] = this->servants_[i];
 
       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->safe_servants_[i].in());
@@ -109,7 +109,7 @@ FooServantList::create_and_activate(CORBA::ORB_ptr orb,
       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/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
index d0ae86d7373..f0a7ccc1198 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
@@ -14,7 +14,7 @@ class FooServantList
 {
   public:
 
-    FooServantList(const char* prefix,
+    FooServantList(const ACE_TCHAR* prefix,
                    unsigned num_servants,
                    unsigned num_clients,
                    int      collocated_test,
@@ -38,7 +38,7 @@ class FooServantList
 
     Foo_i** servants_;
     PortableServer::ServantBase_var* safe_servants_;
-    ACE_CString prefix_;
+    ACE_TString prefix_;
     unsigned num_servants_;
 
     LockType num_clients_lock_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index 787207bd14a..52719eae191 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -13,7 +13,7 @@
 
 
 ServerApp::ServerApp()
-  : ior_filename_("foo"),
+  : ior_filename_(ACE_TEXT("foo")),
     num_servants_(1),
     num_csd_threads_ (1),
     num_clients_(1),
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
index fb193532de2..967f4dab144 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/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_csd_threads_;
     unsigned    num_clients_;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
index ea42b616bdb..3126bd31074 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/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/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 26171d33b3f..85508b0d44f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -12,7 +12,7 @@
 
 
 ServerApp::ServerApp()
-: ior_filename_ ("server.ior")
+: ior_filename_ (ACE_TEXT("server.ior"))
 {
 }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
index 0f8f66d4642..ef49e94a384 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
@@ -22,8 +22,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_clients_;
 };
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 25839b2ea8e..c411ba10cd2 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$")
 
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULongLong file_size)
-  : file_ (pathname),
+  : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)),
     file_io_ (),
     file_size_ (file_size),
     chunk_index_ (1)
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index eeae4d78a10..9c9d3183828 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -170,7 +170,7 @@ void invoke_requests (int argc,
 
       // This ends up being an AMI call, so it won't block.
       handler->run (request_count,
-                    argv[i + 1],
+                    ACE_TEXT_ALWAYS_CHAR(argv[i + 1]),
                     factory.in ());
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index da88ca65b4f..dbf9f55dddd 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (AMI_Observer, Callback_Handler, "$Id$")
 
 Callback_Handler::Callback_Handler (const char *pathname,
                                     Web_Server::Callback_ptr client_callback)
-  : file_ (pathname),
+  : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)),
     file_io_ (),
     callback_ (Web_Server::Callback::_duplicate (client_callback)),
     ami_handler_ (),
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index baa8cdaa201..d5f35ddcf0a 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -175,7 +175,7 @@ void invoke_requests (int argc,
 
       // This ends up being an AMI call, so it won't block.
       handler->run (request_count,
-                    argv[i + 1],
+                    ACE_TEXT_ALWAYS_CHAR(argv[i + 1]),
                     factory.in ());
     }
 }
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 198305ac78b..7e90eac9815 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$")
 
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULongLong file_size)
-  : file_ (pathname),
+  : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)),
     file_io_ (),
     file_size_ (file_size),
     chunk_index_ (1)
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index 358787a07db..69130cbb72e 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -84,7 +84,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       // Get a Content_Iterator
-      const char *pathname = argv[1];
+      const char *pathname = ACE_TEXT_ALWAYS_CHAR(argv[1]);
       Web_Server::Content_Iterator_var contents;
       Web_Server::Metadata_Type_var metadata;
       factory->get_iterator (pathname,
@@ -192,7 +192,7 @@ int retrieve_data (const char *content_type,
 
   // Now spawn a view to display the retrieved data.
   if (::spawn_viewer (content_type,
-                      file_addr.get_path_name ()) != 0)
+                      ACE_TEXT_ALWAYS_CHAR(file_addr.get_path_name ())) != 0)
     return -1;
 
   return 0;
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index bd16e1af17b..76ce8eb38a6 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -31,7 +31,7 @@ Consumer_Handler::init (int argc,
 
    // Then override these variables with command-line arguments if
    // necessary.
-  filtering_criteria = argc > 1 ? argv[1] : "";
+  filtering_criteria = argc > 1 ? ACE_TEXT_ALWAYS_CHAR(argv[1]) : "";
 
   try
     {
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index afb34758c29..0a77d00fb4f 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -120,7 +120,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur
                                                          const char *,
                                                          CORBA::Policy_ptr)
 {
-
 }
 
 
@@ -176,7 +175,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
 
       DT_TEST::instance ()->dt_creator ()->log_msg (msg);
 
-      RTScheduling::Current::IdType* guid;
+      RTScheduling::Current::IdType* guid = 0;
       ACE_NEW (guid,
                RTScheduling::Current::IdType);