Fri Jul 17 14:41:29 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
        * DAnCE/NodeApplication/Name_Utilities.h:
        * DAnCE/NodeApplication/Name_Utilities.cpp:
        * DAnCE/NodeManager/Node_Manager_Module.cpp:
        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h:
        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
          Resolved some unicode compiler errors.

7 files changed, 28 insertions, 18 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 402e9ed3a81..4b136a388e0 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jul 17 14:41:29 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp:
+        * DAnCE/NodeApplication/Name_Utilities.h:
+        * DAnCE/NodeApplication/Name_Utilities.cpp:
+        * DAnCE/NodeManager/Node_Manager_Module.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
+          Resolved some unicode compiler errors.
+
 Fri Jul 17 13:35:03 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * ciao/Logger/File_Logger_Backend.h:
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 442532cad87..2b8fb58d878 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -100,7 +100,7 @@ DAnCE_ExecutionManager_Module::parse_args (int argc, ACE_TCHAR *argv[])
         case 'n':
           DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::parse_args - ")
                         ACE_TEXT("--node-mgr option was parsed out for EM\n")));
-          this->options_.node_managers_.push_back (get_opts.opt_arg ());
+          this->options_.node_managers_.push_back ((const char *)get_opts.opt_arg ());
           break;
 
         case 'p':
@@ -352,7 +352,7 @@ DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
             }
           */
           DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT("Placing node \"%C\" to EM's map.\n"), node_name.c_str()));
-          this->em_impl_->add_node_manager (node_name.c_str(), nm_ior.c_str ());
+          this->em_impl_->add_node_manager ((const ACE_TCHAR *)node_name.c_str(), (const ACE_TCHAR *)nm_ior.c_str ());
         }
 
       if (this->options_.node_map_ != 0)
diff --git a/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
index 9b4d8c92c18..04857d1df2e 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 char *name,
+  Name_Utilities::bind_object (const ACE_TCHAR *name,
                                CORBA::Object_ptr obj,
                                CosNaming::NamingContext_ptr ctx)
   {
@@ -121,7 +121,7 @@ namespace DAnCE
   }
 
   bool
-  Name_Utilities::unbind_object (const char *name,
+  Name_Utilities::unbind_object (const ACE_TCHAR *name,
                                  CosNaming::NamingContext_ptr ctx)
   {
     DANCE_TRACE ("Name_Utilities::unbind_object");
@@ -151,14 +151,14 @@ namespace DAnCE
   }
 
   void
-  Name_Utilities::build_name (const char *name,
+  Name_Utilities::build_name (const ACE_TCHAR *name,
                               CosNaming::Name &nm)
   {
     DANCE_TRACE ("Name_Utilities::build_name");
 
     /*ACE_Auto_Basic_Array_Ptr<ACE_TCHAR>*/  char *safe_array (new char[ACE_OS::strlen (name) + 1]);
 
-    ACE_Tokenizer_T<char> parser (ACE_OS::strcpy (safe_array/*.get ()*/, name));
+    ACE_Tokenizer_T<char> parser (ACE_OS::strcpy (safe_array/*.get ()*/, (const char *)name));
     parser.delimiter ('/');
 
     char *next (0);
diff --git a/CIAO/DAnCE/NodeApplication/Name_Utilities.h b/CIAO/DAnCE/NodeApplication/Name_Utilities.h
index 20a7efd5c45..98cab77574f 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 char *name, 
+    static bool bind_object (const ACE_TCHAR *name,
                              CORBA::Object_ptr obj, 
                              CosNaming::NamingContext_ptr);
     
     /// Will unbind the provided name.  
-    static bool unbind_object (const char *name, 
+    static bool unbind_object (const ACE_TCHAR *name,
                                CosNaming::NamingContext_ptr);
     
   private:
     static void bind_context (CosNaming::Name &nm,
                               CosNaming::NamingContext_ptr);
     
-    static void build_name (const char *nm,
+    static void build_name (const ACE_TCHAR *nm,
                             CosNaming::Name &);
     
   };
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 233b3565ad6..58b4ded17a6 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -467,7 +467,7 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
                     this->options_.node_managers_[0].c_str()));
 
       // Parsing Node name and node manager ior file name
-      ACE_CString node_name = this->options_.node_managers_[0].c_str ();
+      ACE_CString node_name = (const char *)this->options_.node_managers_[0].c_str ();
       ACE_CString node_file;
       size_t npos = node_name.find ('=');
       if (ACE_CString::npos != npos)
@@ -534,7 +534,7 @@ DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
         {
           DANCE_DEBUG ((LM_TRACE,  DLINFO "DAnCE_NodeManager_Module::create_object - "
                         "Writing node IOR %C to file %C.\n", node_file.c_str (), ior.in ()));
-          if (!DAnCE::Node_Manager::write_IOR (node_file.c_str (), ior.in ()))
+          if (!DAnCE::Node_Manager::write_IOR ((const ACE_TCHAR *)node_file.c_str (), ior.in ()))
             DANCE_ERROR ((LM_ERROR, DLINFO "DAnCE_NodeManager_Module::create_object - "
                           "Error: Unable to write IOR to file %C\n",
                           node_file.c_str ()));
@@ -618,7 +618,7 @@ DAnCE_NodeManager_Module::create_nm_properties (DAnCE::PROPERTY_MAP &props)
   }
   {
     CORBA::Any val;
-    val <<= CORBA::Any::from_string (CORBA::string_dup (const_cast<char *>(this->options_.cs_path_)),0);
+    val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.cs_path_),0);
     props.bind (CIAO::Deployment::SERVER_EXECUTABLE, val);
   }
   {
@@ -628,19 +628,19 @@ DAnCE_NodeManager_Module::create_nm_properties (DAnCE::PROPERTY_MAP &props)
   }
   {
     CORBA::Any val;
-    val <<= CORBA::Any::from_string (CORBA::string_dup (const_cast<char *>(this->options_.server_args_)),0);
+    val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.server_args_),0);
     props.bind (CIAO::Deployment::SERVER_ARGUMENTS, val);
   }
   if (this->options_.instance_nc_)
     {
       CORBA::Any val;
-      val <<= CORBA::Any::from_string (CORBA::string_dup (const_cast<char *>(this->options_.instance_nc_)), 0);
+      val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.instance_nc_), 0);
       props.bind (DAnCE::INSTANCE_NC, val);
     }
   if (this->options_.domain_nc_)
     {
       CORBA::Any val;
-      val <<= CORBA::Any::from_string (CORBA::string_dup (const_cast<char *>(this->options_.domain_nc_)), 0);
+      val <<= CORBA::Any::from_string (CORBA::string_dup ((const char *)this->options_.domain_nc_), 0);
       props.bind (DAnCE::DOMAIN_NC, val);
     }
 }
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
index 2573238d318..cd76a9b2022 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
@@ -520,7 +520,7 @@ Plan_Launcher_Base_Impl::stop_plan()
       DANCE_DEBUG((LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ")
                    ACE_TEXT("Stopping plan \"%C\"\n"), this->plan_uuid_));
 
-      if (!this->teardown_plan(this->plan_uuid_))
+      if (!this->teardown_plan((const char *)this->plan_uuid_))
         {
           DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::stop_plan - ")
                         ACE_TEXT("tear down assembly failed: unknown plan uuid.\n")));
@@ -761,7 +761,7 @@ Plan_Launcher_Base_Impl::check_mode_consistentness()
 ACE_CString
 Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s)
   {
-    ACE_CString src(const_cast<char *> (s));
+    ACE_CString src((const char *)s);
     ACE_CString res;
     size_t pos_done = 0;
     while (pos_done < (size_t) src.length())
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
index f2c4fa61cd3..bba73a979bd 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
@@ -81,7 +81,7 @@ public:
   {
     return 0 == s.length();
   }
-  ;
+
   void write_dam_ior(::Deployment::DomainApplicationManager_ptr dam);
 
   void create_external_connections(const ::Deployment::DeploymentPlan &plan,