Mon Jul 20 10:55:13 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
        * DAnCE/DomainApplicationManager/Node_Locator.h:
        * DAnCE/DomainApplicationManager/Node_Locator.cpp:
        * DAnCE/ExecutionManager/ExecutionManager_Module.h:
        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
        * DAnCE/NodeApplication/Name_Utilities.h:
        * DAnCE/NodeApplication/Name_Utilities.cpp:
        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
        * DAnCE/NodeManager/Node_Manager_Module.cpp:
        * DAnCE/Starter/Starter.h:
        * DAnCE/Starter/Starter.cpp:
        * ciao/Containers/Session/Session_Container.cpp:
        * ciao/Logger/File_Logger_Backend.cpp:
          Reverted some unicode changes.

14 files changed, 79 insertions, 63 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 8a5ffb44e8e..c20c5765517 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,20 @@
+Mon Jul 20 10:55:13 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+        * DAnCE/DomainApplicationManager/Node_Locator.h:
+        * DAnCE/DomainApplicationManager/Node_Locator.cpp:
+        * DAnCE/ExecutionManager/ExecutionManager_Module.h:
+        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
+        * DAnCE/NodeApplication/Name_Utilities.h:
+        * DAnCE/NodeApplication/Name_Utilities.cpp:
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+        * DAnCE/Starter/Starter.h:
+        * DAnCE/Starter/Starter.cpp:
+        * ciao/Containers/Session/Session_Container.cpp:
+        * ciao/Logger/File_Logger_Backend.cpp:
+          Reverted some unicode changes.
+
 Mon Jul 20 10:50:47 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 0c35d04ff72..6a88b7b9662 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -449,7 +449,7 @@ DomainApplicationManager_Impl::preparePlan()
            ++iter_plans)
         {
           // Finding correspondent NodeManager
-          Deployment::NodeManager_var nm = this->nodes_.locate_node ((const ACE_TCHAR*)(*iter_plans).ext_id_.c_str ());;
+          Deployment::NodeManager_var nm = this->nodes_.locate_node ((*iter_plans).ext_id_.c_str ());;
           // If NodeManager not found throw StartError exception
           if (CORBA::is_nil (nm.in ()))
             {
diff --git a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
index 387d217c431..0608609168d 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.cpp
@@ -16,11 +16,11 @@ namespace DAnCE
   ::Deployment::NodeManager_ptr
   Node_Locator::locate_node (const ACE_TCHAR *name)
   {
-    ACE_CString ior;
+    ACE_TString ior;
 
-    if (this->nodes_.find ((char*)name, ior) == 0)
+    if (this->nodes_.find (name, ior) == 0)
       {
-        return this->resolve_ior (name, (const ACE_TCHAR *)ior.c_str ());
+        return this->resolve_ior (name, ior.c_str ());
       }
     else
       {
@@ -116,7 +116,7 @@ namespace DAnCE
   Node_Locator::store_ior (const ACE_TCHAR *name, const ACE_TCHAR *ior)
   {
     DANCE_TRACE ("Node_Locator::store_ior");
-    this->nodes_.bind ((char *)name, (char *)ior);
+    this->nodes_.bind (name, ior);
   }
 
   ::Deployment::NodeManager_ptr
@@ -137,7 +137,7 @@ namespace DAnCE
         CosNaming::Name name;
         name.length (1);
 
-        name[0].id = (char *)nodename;
+        name[0].id = nodename;
         name[0].kind = "NodeManager";
 
         CORBA::Object_var obj = this->nc_->resolve (name);
diff --git a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
index 43551a9c761..f3255d0c230 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
+++ b/CIAO/DAnCE/DomainApplicationManager/Node_Locator.h
@@ -41,8 +41,8 @@ namespace DAnCE
 
     ::Deployment::NodeManager_ptr ns_lookup (const ACE_TCHAR *name);
 
-    typedef ACE_Map_Manager<ACE_CString,
-                            ACE_CString,
+    typedef ACE_Map_Manager<ACE_TString,
+                            ACE_TString,
                             ACE_Null_Mutex> NODEMAP;
 
     NODEMAP nodes_;
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 442532cad87..e8b215f6473 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -218,7 +218,6 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
         = PortableServer::POA::_narrow (poa_obj.in ());
 
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-
       PortableServer::POA_var persistent_poa;
       TAO::Utils::PolicyList_Destroyer policies (2);
       policies.length (2);
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
index 0ecd5c57fd2..d3e3fef8e88 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
@@ -54,10 +54,10 @@ class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
         bool rebind_plan_ns_;
         const ACE_TCHAR* rebind_plan_ns_ior_;
         bool port_indirection_;
-        ACE_Vector<ACE_CString> node_managers_;
+        ACE_Vector<ACE_TString> node_managers_;
         bool ignore_failure_;
-        const ACE_TCHAR *node_map_;
-        const ACE_TCHAR *domain_nc_;
+        const char *node_map_;
+        const char *domain_nc_;
 
         SOptions()
             : exec_mgr_file_ (0),
diff --git a/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
index 5a691796c9f..9b4d8c92c18 100644
--- a/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
+++ b/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
@@ -26,7 +26,7 @@ namespace DAnCE
   }
 
   bool
-  Name_Utilities::bind_object (const ACE_TCHAR *name,
+  Name_Utilities::bind_object (const char *name,
                                CORBA::Object_ptr obj,
                                CosNaming::NamingContext_ptr ctx)
   {
@@ -121,7 +121,7 @@ namespace DAnCE
   }
 
   bool
-  Name_Utilities::unbind_object (const ACE_TCHAR *name,
+  Name_Utilities::unbind_object (const char *name,
                                  CosNaming::NamingContext_ptr ctx)
   {
     DANCE_TRACE ("Name_Utilities::unbind_object");
@@ -151,7 +151,7 @@ namespace DAnCE
   }
 
   void
-  Name_Utilities::build_name (const ACE_TCHAR *name,
+  Name_Utilities::build_name (const char *name,
                               CosNaming::Name &nm)
   {
     DANCE_TRACE ("Name_Utilities::build_name");
diff --git a/CIAO/DAnCE/NodeApplication/Name_Utilities.h b/CIAO/DAnCE/NodeApplication/Name_Utilities.h
index 98cab77574f..9a4d229d348 100644
--- a/CIAO/DAnCE/NodeApplication/Name_Utilities.h
+++ b/CIAO/DAnCE/NodeApplication/Name_Utilities.h
@@ -21,19 +21,19 @@ namespace DAnCE
     
     /// Binds object to provided name, which may be formatted with / to indicate
     /// naming contexts, e.g. A/B/C. 
-    static bool bind_object (const ACE_TCHAR *name,
+    static bool bind_object (const char *name,
                              CORBA::Object_ptr obj, 
                              CosNaming::NamingContext_ptr);
     
     /// Will unbind the provided name.  
-    static bool unbind_object (const ACE_TCHAR *name,
+    static bool unbind_object (const char *name,
                                CosNaming::NamingContext_ptr);
     
   private:
     static void bind_context (CosNaming::Name &nm,
                               CosNaming::NamingContext_ptr);
     
-    static void build_name (const ACE_TCHAR *nm,
+    static void build_name (const char *nm,
                             CosNaming::Name &);
     
   };
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 4e1f3eb3364..e4265e54f85 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -1021,7 +1021,7 @@ NodeApplication_Impl::store_instance_ior (Instance &inst)
 {
   DANCE_TRACE ("NodeApplication_impl::store_instance_ior");
 
-  const ACE_TCHAR *name = 0;
+  const char *name = 0;
 
   if (get_property_value (DAnCE::REGISTER_NAMING,
                           this->plan_.instance[inst.idd_idx].configProperty,
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index af58bd27fd3..1ea6487fcdc 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -407,7 +407,7 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
           else if (this->options_.process_ns_)
             {
               const int argc_ns = 1;
-              ACE_TCHAR* argv_ns[argc_ns];
+              char* argv_ns[argc_ns];
               argv_ns[0] = argv[0];
               naming_obj = orb->resolve_initial_references ("NameService");
               if (0 != this->options_.process_ns_file_)
diff --git a/CIAO/DAnCE/Starter/Starter.cpp b/CIAO/DAnCE/Starter/Starter.cpp
index 1ed21f80fc9..81ecf1af650 100644
--- a/CIAO/DAnCE/Starter/Starter.cpp
+++ b/CIAO/DAnCE/Starter/Starter.cpp
@@ -137,7 +137,7 @@ void Starter::parseArgs(int argc, ACE_TCHAR * argv[])
 
   int j;
   char c;
-  ACE_CString s;
+  ACE_TString s;
   while ( (c = opts ()) != -1)
     {
       DANCE_DEBUG((LM_TRACE, "[%M] Option : \"%s\" with argument \"%s\"\n", opts.last_option(), opts.opt_arg()));
@@ -159,11 +159,11 @@ void Starter::parseArgs(int argc, ACE_TCHAR * argv[])
               {
                 ACE_CString nodename;
                 Node node;
-                size_t const pos = s.find("=");
+                size_t const pos = s.find(ACE_TEXT ("="));
                 if (ACE_CString::npos != pos)
                   {
-                    nodename = s.substring(0, pos).c_str ();
-                    node.ior_ = s.substring(pos + 1).c_str ();
+                    nodename = s.substring(0, pos);
+                    node.ior_ = s.substring(pos + 1);
                     /*
                     node.obj = this->orb_->string_to_object(objstr.c_str());
                     if (CORBA::is_nil (node.obj))
@@ -300,7 +300,7 @@ void Starter::execute()
       (*it).int_id_.obj = this->initNodeManager((*it).ext_id_.c_str());
       if (0 != (*it).int_id_.iorfile_.length())
         {
-          this->write_IOR((const ACE_TCHAR *)(*it).int_id_.iorfile_.c_str(), this->orb_->object_to_string((*it).int_id_.obj));
+          this->write_IOR((*it).int_id_.iorfile_.c_str(), this->orb_->object_to_string((*it).int_id_.obj));
         }
     }
 
@@ -311,7 +311,7 @@ void Starter::execute()
       em = this->initExecutionManager();
       if ( !CORBA::is_nil(em) && 0 < this->optEMFile_.length())
         {
-          this->write_IOR((const ACE_TCHAR *)this->optEMFile_.c_str(),
+          this->write_IOR(this->optEMFile_.c_str(),
               this->orb_->object_to_string(em.in()));
         }
       orb_run = true;
@@ -519,7 +519,7 @@ void Starter::initNaming()
       ACE_CString directive =
         "dynamic Naming_Loader Service_Object * TAO_CosNaming_Serv:_make_TAO_Naming_Loader() \"";
       directive += this->optNSOptions_ + "\"";
-      ACE_Service_Config::process_directive((const ACE_TCHAR *)directive.c_str());
+      ACE_Service_Config::process_directive(directive.c_str());
     }
 
     DANCE_DEBUG ( (LM_TRACE, "[%M] Putting ior to file if necessary...\n"));
@@ -684,7 +684,7 @@ Starter::argCopyForNaming (int & c, char **& v)
   }
 
 void
-Starter::argCopyForNode (const char * node, int & c, ACE_TCHAR **& v)
+Starter::argCopyForNode (const char * node, int & c, char **& v)
   {
     const char * validOptions[] =
       { //"--node-mgr", "-n"
@@ -696,16 +696,16 @@ Starter::argCopyForNode (const char * node, int & c, ACE_TCHAR **& v)
       };
 
     int total_sz = this->argc_ + 1;
-    v = new ACE_TCHAR*[total_sz];
+    v = new char*[total_sz];
     for (int i = 0; i < total_sz; ++i) v[i] = 0;
 
     c = 0;
-    v[c++] = (ACE_TCHAR *)CORBA::string_dup ("-n");
-    v[c++] = (ACE_TCHAR *)CORBA::string_dup (node);
+    v[c++] = CORBA::string_dup ("-n");
+    v[c++] = CORBA::string_dup (node);
     Node n;
     if (0 == this->nodes_.find(node, n) && 0 < n.iorfile_.length())
       {
-        v[c++] = (ACE_TCHAR *)CORBA::string_dup (n.iorfile_.c_str());
+        v[c++] = CORBA::string_dup (n.iorfile_.c_str());
       }
 
     bool take = false;
@@ -716,7 +716,7 @@ Starter::argCopyForNode (const char * node, int & c, ACE_TCHAR **& v)
             take = false;
             for (int j = 0; 0 != validOptions[j]; ++j)
               {
-                if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], (ACE_TCHAR *)validOptions[j]))
+                if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], validOptions[j]))
                   {
                     if (i + 1 < this->argc_
                         && (0 == ACE_OS::strcmp (this->argv_[i], ACE_TEXT("--node-mgr")) || 0 == ACE_OS::strcmp (this->argv_[i], ACE_TEXT("-n"))))
@@ -728,14 +728,14 @@ Starter::argCopyForNode (const char * node, int & c, ACE_TCHAR **& v)
                           }
                         else if (s == node)
                           {
-                            v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+                            v[c++] = CORBA::string_dup (this->argv_[i]);
                             take = true;
                             break;
                           }
                       }
                     else
                       {
-                        v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+                        v[c++] = CORBA::string_dup (this->argv_[i]);
                         take = true;
                         break;
                       }
@@ -744,14 +744,14 @@ Starter::argCopyForNode (const char * node, int & c, ACE_TCHAR **& v)
           }
         else if (take)
           {
-            v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+            v[c++] = CORBA::string_dup (this->argv_[i]);
           }
       }
     v[c] = 0;
   }
 
 void
-Starter::argCopyForEM (int & c, ACE_TCHAR **& v)
+Starter::argCopyForEM (int & c, char **& v)
   {
     const char * validOptions[] =
       {
@@ -765,7 +765,7 @@ Starter::argCopyForEM (int & c, ACE_TCHAR **& v)
       };
 
     int total_sz = this->argc_ + 2 * this->nodes_.total_size() + 1;
-    v = new ACE_TCHAR*[total_sz];
+    v = new char*[total_sz];
     for (int i = 0; i < total_sz; ++i) v[i] = 0;
 
     bool take = false;
@@ -777,9 +777,9 @@ Starter::argCopyForEM (int & c, ACE_TCHAR **& v)
             take = false;
             for (int j = 0; 0 != validOptions[j]; ++j)
               {
-                if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], (const ACE_TCHAR *)validOptions[j]))
+                if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], validOptions[j]))
                   {
-                    v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+                    v[c++] = CORBA::string_dup (this->argv_[i]);
                     take = true;
                     break;
                   }
@@ -787,7 +787,7 @@ Starter::argCopyForEM (int & c, ACE_TCHAR **& v)
           }
         else if (take)
           {
-            v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+            v[c++] = CORBA::string_dup (this->argv_[i]);
           }
       }
 
@@ -796,7 +796,7 @@ Starter::argCopyForEM (int & c, ACE_TCHAR **& v)
         ++it)
       {
         //v[c++] = CORBA::string_dup("--node-mgr");
-        v[c++] = (ACE_TCHAR *)CORBA::string_dup ("-n");
+        v[c++] = CORBA::string_dup ("-n");
         ACE_CString s = (*it).ext_id_;
         s += "=";
         if ( 0 < (*it).int_id_.ior_.length() )
@@ -812,14 +812,14 @@ Starter::argCopyForEM (int & c, ACE_TCHAR **& v)
             DANCE_ERROR((LM_ERROR, "[%M] No IOR for node \"%s\"\n", (*it).ext_id_.c_str()));
             continue;
           }
-        v[c++] = (ACE_TCHAR *)CORBA::string_dup (s.c_str());
+        v[c++] = CORBA::string_dup (s.c_str());
       }
 
     v[c] = 0;
   }
 
 void
-Starter::argCopyForPL (int & c, ACE_TCHAR **& v)
+Starter::argCopyForPL (int & c, char **& v)
   {
     const char * validOptions[] =
       { "--em-ior", "-k"
@@ -833,7 +833,7 @@ Starter::argCopyForPL (int & c, ACE_TCHAR **& v)
       };
 
     int total_sz = this->argc_ + 1;
-    v = new ACE_TCHAR*[total_sz];
+    v = new char*[total_sz];
     for (int i = 0; i < total_sz; ++i) v[i] = 0;
 
     bool take = false;
@@ -845,9 +845,9 @@ Starter::argCopyForPL (int & c, ACE_TCHAR **& v)
             take = false;
             for (int j = 0; 0 != validOptions[j]; ++j)
               {
-                if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], (const ACE_TCHAR *)validOptions[j]))
+                if (this->argv_[i] == ACE_OS::strstr (this->argv_[i], validOptions[j]))
                   {
-                    v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+                    v[c++] = CORBA::string_dup (this->argv_[i]);
                     take = true;
                     break;
                   }
@@ -855,18 +855,18 @@ Starter::argCopyForPL (int & c, ACE_TCHAR **& v)
           }
         else if (take)
           {
-            v[c++] = (ACE_TCHAR *)CORBA::string_dup (this->argv_[i]);
+            v[c++] = CORBA::string_dup (this->argv_[i]);
           }
       }
     v[c] = 0;
   }
 
 void
-Starter::releaseArgs (int c, ACE_TCHAR ** v)
+Starter::releaseArgs (int c, char ** v)
   {
     for (int i = 0; i < c && 0 != v[i]; ++i)
       {
-        CORBA::string_free ((char *)v[i]);
+        CORBA::string_free (v[i]);
         v[i] = 0;
       }
     delete [] v;
diff --git a/CIAO/DAnCE/Starter/Starter.h b/CIAO/DAnCE/Starter/Starter.h
index 32bb19958c6..4e737b73e4e 100644
--- a/CIAO/DAnCE/Starter/Starter.h
+++ b/CIAO/DAnCE/Starter/Starter.h
@@ -59,10 +59,10 @@ namespace DAnCE
       CORBA::Object_ptr initExecutionManager();
       void runPlanLauncher();
       void argCopyForNaming (int & c, char **& v);
-      void argCopyForNode (const char * node, int & c, ACE_TCHAR **& v);
-      void argCopyForEM (int & c, ACE_TCHAR **& v);
-      void argCopyForPL (int & c, ACE_TCHAR **& v);
-      void releaseArgs (int c, ACE_TCHAR ** v);
+      void argCopyForNode (const char * node, int & c, char **& v);
+      void argCopyForEM (int & c, char **& v);
+      void argCopyForPL (int & c, char **& v);
+      void releaseArgs (int c, char ** v);
       static bool isPossibleOption(const char* opt);
 
       void configure_logging_backend (void);
diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp
index 411cf3a3e46..840e0c5e972 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.cpp
+++ b/CIAO/ciao/Containers/Session/Session_Container.cpp
@@ -266,7 +266,7 @@ namespace CIAO
         ACE_DLL executor_dll;
         ACE_DLL servant_dll;
 
-        if (executor_dll.open ((ACE_TCHAR*)primary_artifact,
+        if (executor_dll.open (primary_artifact,
                                ACE_DEFAULT_SHLIB_MODE,
                                0) != 0)
           {
@@ -285,7 +285,7 @@ namespace CIAO
                     "Session_Container::install_home - "
                     "Executor DLL successfully opened\n"));
 
-        if (servant_dll.open ((ACE_TCHAR*)servant_artifact,
+        if (servant_dll.open (servant_artifact,
                               ACE_DEFAULT_SHLIB_MODE,
                               0) != 0)
           {
@@ -333,11 +333,11 @@ namespace CIAO
         // We have to do this casting in two steps because the C++
         // standard forbids casting a pointer-to-object (including
         // void*) directly to a pointer-to-function.
-        void *void_ptr = executor_dll.symbol ((ACE_TCHAR*)entry_point);
+        void *void_ptr = executor_dll.symbol (entry_point);
         ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
         hcreator = reinterpret_cast<HomeFactory> (tmp_ptr);
 
-        void_ptr = servant_dll.symbol ((ACE_TCHAR*)servant_entrypoint);
+        void_ptr = servant_dll.symbol (servant_entrypoint);
         tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
         screator = reinterpret_cast<HomeServantFactory> (tmp_ptr);
       }
@@ -487,7 +487,7 @@ namespace CIAO
             throw Components::Deployment::UnknownImplId ();
           }
 
-        if (executor_dll.open ((ACE_TCHAR*)primary_artifact,
+        if (executor_dll.open (primary_artifact,
                                ACE_DEFAULT_SHLIB_MODE,
                                0) != 0)
           {
@@ -505,7 +505,7 @@ namespace CIAO
         CIAO_DEBUG ((LM_TRACE, CLINFO
                     "Session_Container::install_component - Executor DLL successfully opened\n"));
 
-        if (servant_dll.open ((ACE_TCHAR*)servant_artifact,
+        if (servant_dll.open (servant_artifact,
                               ACE_DEFAULT_SHLIB_MODE,
                               0) != 0)
           {
@@ -552,11 +552,11 @@ namespace CIAO
         // We have to do this casting in two steps because the C++
         // standard forbids casting a pointer-to-object (including
         // void*) directly to a pointer-to-function.
-        void *void_ptr = executor_dll.symbol ((ACE_TCHAR*)entry_point);
+        void *void_ptr = executor_dll.symbol (entry_point);
         ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
         ccreator = reinterpret_cast<ComponentFactory> (tmp_ptr);
 
-        void_ptr = servant_dll.symbol ((ACE_TCHAR*)servant_entrypoint);
+        void_ptr = servant_dll.symbol (servant_entrypoint);
         tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr);
         screator = reinterpret_cast<ComponentServantFactory> (tmp_ptr);
       }
diff --git a/CIAO/ciao/Logger/File_Logger_Backend.cpp b/CIAO/ciao/Logger/File_Logger_Backend.cpp
index 848f4e22708..6e4f0695509 100644
--- a/CIAO/ciao/Logger/File_Logger_Backend.cpp
+++ b/CIAO/ciao/Logger/File_Logger_Backend.cpp
@@ -16,7 +16,7 @@ namespace CIAO
     if (0 == this->fh_)
       {
         ACE_CString s = "Failed to open log file \"";
-        s += this->filename_.c_str ();
+        s += this->filename_;
         s += "\"";
         throw LoggerError (s.c_str());
       }