Wed Jan 31 15:44:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 36 insertions, 45 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 952dddfa39d..67ece78558d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 31 15:44:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/Plan_Generator/PCVisitor.cpp:
+        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp:
+        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp:
+        * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
+        * RACE/Controller/Component/Controller_exec.cpp:
+        * RACE/Controller/Component/Controller_exec.h:
+
 Wed Jan 31 15:03:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/ExecutionManager/DAM_Map.{h,cpp}:
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp b/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
index 39bbb9bb434..99621fcc7c2 100644
--- a/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
@@ -23,7 +23,7 @@
  * structure of the DeploymentPlan.
  *
  * @author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu> 
+ *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
  */
 //========================================================================
 
@@ -131,7 +131,7 @@ void PCVisitor::Visit (Deployment::MonolithicImplementationDescription &mid)
   if (!modify_)
     {
       //increase the implementation length by one
-      size_t impl_len = plan_.implementation.length ();
+      size_t const impl_len = plan_.implementation.length ();
       last_impl_index_ = impl_len;
       plan_.implementation.length (impl_len + 1);
     }
@@ -146,16 +146,16 @@ void PCVisitor::Visit (Deployment::NamedImplementationArtifact &nia)
   if (!modify_)
     {
       //increase the artifact length by one
-      size_t arti_len = plan_.artifact.length ();
+      size_t const arti_len = plan_.artifact.length ();
       plan_.artifact.length (arti_len + 1);
 
       //set the name
       plan_.artifact[arti_len].name = nia.name;
 
-      //set the artifactRef of implementation
-      size_t last_mdd = plan_.implementation.length () - 1;
+      // Set the artifactRef of implementation
+      size_t const last_mdd = plan_.implementation.length () - 1;
       Deployment::MonolithicDeploymentDescription& mdd = plan_.implementation[last_mdd];
-      size_t ref_len = mdd.artifactRef.length ();
+      size_t const ref_len = mdd.artifactRef.length ();
       mdd.artifactRef.length (ref_len + 1);
       mdd.artifactRef[ref_len] = arti_len;
     }
@@ -174,7 +174,7 @@ void PCVisitor::Visit (Deployment::ImplementationArtifactDescription &iad)
 
       //set the location
       size_t plan_loc_len = add.location.length ();
-      size_t num_loc = iad.location.length ();
+      size_t const num_loc = iad.location.length ();
       for (size_t i = 0; i < num_loc; ++i)
       {
         add.location.length (plan_loc_len + 1);
@@ -188,7 +188,7 @@ void PCVisitor::Visit (Deployment::ImplementationArtifactDescription &iad)
 
   else
     {
-      size_t num_arti = plan_.artifact.length ();
+      size_t const num_arti = plan_.artifact.length ();
       for (size_t i = 0; i < num_arti; ++i)
         {
           if (ACE_OS::strstr (iad.location[0], plan_.artifact[i].location[0]))
@@ -259,7 +259,7 @@ void PCVisitor::
 update_execParameter (Deployment::ImplementationArtifactDescription& iad,
                       Deployment::ArtifactDeploymentDescription& add)
 {
-  size_t num_execP = iad.execParameter.length ();
+  size_t const num_execP = iad.execParameter.length ();
   size_t execP_len = add.execParameter.length ();
   for (size_t j = 0; j < num_execP; ++j)
   {
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
index a1e5831e0af..6c96e2a9e04 100644
--- a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
@@ -18,8 +18,7 @@ namespace CIAO
     fetch_reference_naming (CORBA::ORB_ptr orb,
                             const char *repoman_name = 0)
     {
-      CORBA::Object_var tmp =
-        orb->resolve_initial_references ("NameService");
+      CORBA::Object_var tmp = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var pns =
         CosNaming::NamingContext::_narrow (tmp.in ());
@@ -88,7 +87,6 @@ namespace CIAO
       ACE_TCHAR package[PACKAGE_NAME_LEN];
 
       size_t length = ACE_OS::strlen (package_uri);
-
       size_t pos1 = 0;
       size_t pos2 = ACE_OS::strcspn (package_uri + pos1, "+");
 
@@ -148,6 +146,5 @@ namespace CIAO
 
       return true;
     }
-
   }
 }
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index 9afc6a69dc4..d8924d89ab0 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -12,8 +12,7 @@ namespace CIAO
     static CORBA::Object_ptr
     fetch_reference_naming (CORBA::ORB_ptr orb)
     {
-      CORBA::Object_var tmp =
-        orb->resolve_initial_references ("NameService");
+      CORBA::Object_var tmp = orb->resolve_initial_references ("NameService");
 
       CosNaming::NamingContext_var pns =
         CosNaming::NamingContext::_narrow (tmp.in ());
@@ -97,8 +96,7 @@ namespace CIAO
 
       CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri);
 
-      ::Deployment::DeploymentPlan_var plan =
-          intf.get_plan ();
+      ::Deployment::DeploymentPlan_var plan = intf.get_plan ();
 
       // Use the package name(s) or type(s) to modify the location of all the
       // artifacts in DeploymentPlan.
@@ -166,10 +164,10 @@ namespace CIAO
               0);
 
           if (CIAO::debug_level ())
-          {
-            ACE_DEBUG ((LM_DEBUG,
-              "CIAO_PlanLauncher: start Launch application...\n"));
-          }
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                "CIAO_PlanLauncher: start Launch application...\n"));
+            }
 
           // Dont not start the Application immediately since it violates
           // the semantics of component activation sequence
@@ -377,8 +375,7 @@ namespace CIAO
     {
       CIAO::Config_Handlers::XML_File_Intf intf (deployment_plan_uri);
 
-      ::Deployment::DeploymentPlan_var plan =
-          intf.get_plan ();
+      ::Deployment::DeploymentPlan_var plan = intf.get_plan ();
 
       // Use the package name(s) or type(s) to modify the location of all the
       // artifacts in DeploymentPlan.
diff --git a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
index 2df0ce868c8..06fd20d41ba 100644
--- a/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
+++ b/CIAO/DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h
@@ -47,8 +47,7 @@ namespace CIDL_RoundTrip_Impl
       ACE_THROW_SPEC ((CORBA::SystemException));
     */
 
-    NodeAppTest::CCM_LatencyTest_ptr
-    get_facet_1()
+    NodeAppTest::CCM_LatencyTest_ptr get_facet_1()
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/CIAO/RACE/Controller/Component/Controller_exec.cpp b/CIAO/RACE/Controller/Component/Controller_exec.cpp
index 1606e03a867..1287efe1e8d 100644
--- a/CIAO/RACE/Controller/Component/Controller_exec.cpp
+++ b/CIAO/RACE/Controller/Component/Controller_exec.cpp
@@ -48,9 +48,7 @@ namespace CIAO
                         ::CORBA::SystemException,
                         ::Components::CCMException))
       {
-        this->context_ =
-        Controller_Context::_narrow (
-          ctx);
+        this->context_ = Controller_Context::_narrow (ctx);
 
         if (this->context_ == 0)
         {
diff --git a/CIAO/RACE/Controller/Component/Controller_exec.h b/CIAO/RACE/Controller/Component/Controller_exec.h
index def356fef65..115304657f1 100644
--- a/CIAO/RACE/Controller/Component/Controller_exec.h
+++ b/CIAO/RACE/Controller/Component/Controller_exec.h
@@ -35,47 +35,39 @@ namespace CIAO
         ACE_THROW_SPEC ((::CORBA::SystemException));
 
         // Attribute operations.
-        virtual ::CORBA::Double
-        sampling_period ()
+        virtual ::CORBA::Double sampling_period ()
         ACE_THROW_SPEC ((CORBA::SystemException));
 
         // Port operations.
 
         // Operations from Components::SessionComponent
 
-        virtual void
-        set_session_context (
-          ::Components::SessionContext_ptr ctx)
+        virtual void set_session_context (::Components::SessionContext_ptr ctx)
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
-        virtual void
-        ciao_preactivate ()
+        virtual void ciao_preactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
-        virtual void
-        ciao_postactivate ()
+        virtual void ciao_postactivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
-        virtual void
-        ccm_activate ()
+        virtual void ccm_activate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
-        virtual void
-        ccm_passivate ()
+        virtual void ccm_passivate ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
 
-        virtual void
-        ccm_remove ()
+        virtual void ccm_remove ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));
@@ -102,8 +94,7 @@ namespace CIAO
 
         // Implicit operations.
 
-        virtual ::Components::EnterpriseComponent_ptr
-        create ()
+        virtual ::Components::EnterpriseComponent_ptr create ()
         ACE_THROW_SPEC ((
                           ::CORBA::SystemException,
                           ::Components::CCMException));