2 files changed, 9 insertions, 8 deletions

diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index 21719294108..60d698a398f 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -98,13 +98,14 @@ namespace DAnCE
     DANCE_TRACE ( "NodeManager_Impl::preparePlan");
 
     DANCE_DEBUG ((LM_DEBUG, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - ")
-                  ACE_TEXT("started for node %C and plan %C\n"), this->name_.c_str(), plan.UUID.in()));
+                  ACE_TEXT("started for node %C and plan %C\n"),
+                  this->name_.c_str(), plan.UUID.in()));
 
 #ifdef GEN_OSTREAM_OPS
     {
       std::ostringstream plan_stream;
       plan_stream << plan << std::endl;
-      DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::preparePlan - $s",
+      DANCE_DEBUG ((LM_TRACE, DLINFO "NodeManager_impl::preparePlan - %C",
                     plan_stream.str ().c_str ()));
     }
 #endif /* GEN_OSTREAM_OPS */
@@ -135,7 +136,7 @@ namespace DAnCE
     PortableServer::ObjectId_var id = this->poa_->activate_object (manager);
     CORBA::Object_var nam = this->poa_->id_to_reference (id.in());
 
-    //there is an idea to check if plan.UUID really exists
+    // There is an idea to check if plan.UUID really exists
     this->managers_.bind (plan.UUID.in(), manager);
     // narrow should return a nil reference if it fails.
     DANCE_DEBUG ((LM_INFO, DLINFO ACE_TEXT("NodeManager_impl::preparePlan - NodeApplicationManager for plan %C completed\n"),
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index 58b4ded17a6..af58bd27fd3 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 = (const char *)this->options_.node_managers_[0].c_str ();
+      ACE_CString node_name = this->options_.node_managers_[0].c_str ();
       ACE_CString node_file;
       size_t npos = node_name.find ('=');
       if (ACE_CString::npos != npos)
@@ -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 char *)this->options_.cs_path_),0);
+    val <<= CORBA::Any::from_string (CORBA::string_dup (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 char *)this->options_.server_args_),0);
+    val <<= CORBA::Any::from_string (CORBA::string_dup (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 char *)this->options_.instance_nc_), 0);
+      val <<= CORBA::Any::from_string (CORBA::string_dup (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 char *)this->options_.domain_nc_), 0);
+      val <<= CORBA::Any::from_string (CORBA::string_dup (this->options_.domain_nc_), 0);
       props.bind (DAnCE::DOMAIN_NC, val);
     }
 }