Thu Dec 10 10:00:16 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
          Fixed compiler warnings about arguments not used

        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
          Fixed invalid string comparison and const improvements

3 files changed, 15 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6b7a631598b..afb9963c382 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec 10 10:00:16 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
+          Fixed compiler warnings about arguments not used
+
+        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
+          Fixed invalid string comparison and const improvements
+
 Thu Dec 10 09:41:12 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc:
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index 34871bd3938..c25bd6dd6d1 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -231,7 +231,8 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
 
   DANCE_DEBUG ((LM_DEBUG, DLINFO
                 ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
-                ACE_TEXT("First phase produced %u child plans, proceeding to second\n")));
+                ACE_TEXT("First phase produced %u child plans, proceeding to second\n"),
+                sub_plans.current_size ()));
 
   // (1) Iterate over the <instance> field of the global DeploymentPlan
   //     structure.
@@ -267,7 +268,7 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
       // field with a new "implementation", which is specified by the
       // <implementationRef> field of <my_instance> entry.  NOTE: The
       // <artifactRef> field needs to be changed accordingly.
-      const ::Deployment::MonolithicDeploymentDescription & my_implementation
+      ::Deployment::MonolithicDeploymentDescription const & my_implementation
         = plan.implementation[my_instance.implementationRef];
 
       CORBA::ULong index_imp = child_plan.implementation.length ();
@@ -335,14 +336,14 @@ DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & pl
                   Deployment::PlanConnectionDescription * connection_copied = 0;
                   for (CORBA::ULong m = 0; m < child_plan.connection.length(); ++m)
                     {
-                      if (ACE_OS::strcmp (plan.connection[j].name, child_plan.connection[m].name) == 0)
+                      if (ACE_OS::strcmp (plan.connection[j].name.in (), child_plan.connection[m].name.in ()) == 0)
                         {
                           connection_copied = &child_plan.connection[m];
                           break;
                         }
                     }
 
-                  if (0 == connection_copied)
+                  if (!connection_copied)
                     {
                       // Copy the connection
                       CORBA::ULong const index_con = child_plan.connection.length();
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index 4cc59b43832..cbf02d945e0 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -1863,7 +1863,7 @@ NodeApplication_Impl::finishLaunch (const ::Deployment::Connections & providedRe
                                                                       "Expected 2 internalenpoints.");
                               }
                           }
-                        catch (::Deployment::InvalidConnection &ex)
+                        catch (const ::Deployment::InvalidConnection &)
                           {
                             throw;
                           }
@@ -2124,7 +2124,7 @@ NodeApplication_Impl::connect_local_receptacle (Components::CCMObject_ptr facet,
 
       cont->connect_local_facet (facet, facet_name.c_str (), receptacle, recep_name.c_str ());
     }
-  catch (CORBA::Exception  &ex)
+  catch (const CORBA::Exception  &)
     { // @@todo: need better exception handling.
       DANCE_ERROR ((LM_ERROR, DLINFO ACE_TEXT ("NodeApplication_Impl::connect_local_receptacle - ")
                     ACE_TEXT ("Caught unexpected CORBA excption while connecting port %C ")