Tue Nov 25 14:30:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 37 insertions, 16 deletions

diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog
index b9c17ff0bcf..2c9e4b123e9 100644
--- a/flat/CIAO/ChangeLog
+++ b/flat/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Tue Nov 25 14:30:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ccm/ComponentServer/ComponentServer.mpc:
+          Only compile the IDL files as part of one project
+
+        * ciao/Servants/Servants.mpc:
+          Move template files to seperate group
+
+        * DAnCE/NodeApplication/Name_Utilities.cpp:
+          Fixed warning
+
+        * ofccm/NodeApplication/NodeApplication_Impl.cpp:
+          Initialise pointers with 0
+
 Tue Nov 25 08:30:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Servants/Swapping/CIAO_SwapExec.idl:
diff --git a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
index a22b0f9f791..f0541437caa 100644
--- a/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
+++ b/flat/CIAO/DAnCE/NodeApplication/Name_Utilities.cpp
@@ -50,7 +50,7 @@ namespace DAnCE
           {
             ctx->bind (nm, obj);
           }
-        catch (const CosNaming::NamingContext::AlreadyBound &ex)
+        catch (const CosNaming::NamingContext::AlreadyBound &)
           {
             DANCE_ERROR ((LM_WARNING, DLINFO "Name_Utilities::bind_object - "
                           "Name %C already bound, rebinding....\n",
diff --git a/flat/CIAO/ccm/ComponentServer/ComponentServer.mpc b/flat/CIAO/ccm/ComponentServer/ComponentServer.mpc
index dfc62e329a0..be25b8fa30f 100644
--- a/flat/CIAO/ccm/ComponentServer/ComponentServer.mpc
+++ b/flat/CIAO/ccm/ComponentServer/ComponentServer.mpc
@@ -32,6 +32,8 @@ project(CCM_ComponentServer_stub) : taolib_with_idl, tao_output, messaging, ccm_
     ComponentServer_ClientC.cpp
     ComponentServer_BaseC.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(CCM_ComponentServer_svnt) : taolib_with_idl, tao_output, messaging, ccm_componentserver_stub,  anytypecode, ciao_lib  {
@@ -49,5 +51,7 @@ project(CCM_ComponentServer_svnt) : taolib_with_idl, tao_output, messaging, ccm_
     ComponentServer_ClientS.cpp
     ComponentServer_BaseS.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/flat/CIAO/ciao/Servants/Servants.mpc b/flat/CIAO/ciao/Servants/Servants.mpc
index 7538ee90519..253fef4a4b8 100644
--- a/flat/CIAO/ciao/Servants/Servants.mpc
+++ b/flat/CIAO/ciao/Servants/Servants.mpc
@@ -25,12 +25,15 @@ project(CIAO_Servant_Impl) : ciao_servant_activator, ciao_port_activator_stub, c
      Home_Servant_Impl_T.cpp
      Servant_Impl_Base.cpp
      Servant_Impl_T.cpp
-     Servant_Impl_Utils_T.cpp
      StandardConfigurator_Impl.cpp
      Port_Activator.cpp
      Port_Activator_T.cpp
    }
 
+   Template_Files {
+     Servant_Impl_Utils_T.cpp
+   }
+
    Header_Files {
      CIAO_Servant_Impl_export.h
      Home_Servant_Impl_Base.h
diff --git a/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp b/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp
index 356432a4bbd..c20ee117122 100644
--- a/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp
+++ b/flat/CIAO/ofccm/NodeApplication/NodeApplication_Impl.cpp
@@ -409,7 +409,7 @@ NodeApplication_Impl::createContainer (unsigned int index)
                          this->plan_.instance[index].configProperty,
                          feature_any))
     {
-      const char * tmp;
+      const char * tmp = 0;
       feature_any >>= tmp;
       processDest = tmp;
     }
@@ -478,7 +478,7 @@ NodeApplication_Impl::createComponent (unsigned int index)
                          this->plan_.instance[index].configProperty,
                          feature_any))
     {
-      const char* tmp;
+      const char* tmp = 0;
       feature_any >>= tmp;
       homeName = tmp;
     }
@@ -626,7 +626,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           ACE_DEBUG ( (LM_DEBUG, "[%M] NodeApplication_impl::createConfigValues PROCESS_DESTINATION variable has been added for CreateComponentServer operation\n"));
           cfg[ind] = new CIAO::ConfigValue_impl (Components::PROCESS_DESTINATION,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -643,7 +643,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           ACE_DEBUG ( (LM_DEBUG, "[%M] NodeApplication_impl::createConfigValues COMPONENT_KIND variable has been added for CreateContainer operation\n"));
           cfg[ind] = new CIAO::ConfigValue_impl (Components::COMPONENT_KIND,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -661,7 +661,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::COMPONENT_KIND,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -674,7 +674,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::SERVANT_LIFETIME,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       //TODO Clarify is this parameter is compulsory
 //            else {
@@ -687,7 +687,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::THREADING_POLICY,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -700,7 +700,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::HOME_REPOSITORY_ID,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -713,7 +713,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::HOME_SERVANT_CLASSNAME,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -726,7 +726,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::VALUETYPE_FACTORY_DEPENDENCIES,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       //TODO Clarify is this parameter is compulsory
 //            else {
@@ -739,7 +739,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::FAULT_TOLERANCE_REPLICATION_STYLE,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       //TODO Clarify is this parameter is compulsory
 //            else {
@@ -757,7 +757,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::COMPONENT_NAME,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       else
         {
@@ -770,7 +770,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::USES_PORT_TIMEOUTS,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
       if (read_config_value (Components::FAULT_TOLERANCE_GROUP_NAME, prop, feature_any))
         {
@@ -778,7 +778,7 @@ NodeApplication_Impl::createConfigValues (const Deployment::Properties& prop,
           cfg.length (ind + 1);
           cfg[ind] = new CIAO::ConfigValue_impl (Components::FAULT_TOLERANCE_GROUP_NAME,
                                                  feature_any.in());
-          ind++;
+          ++ind;
         }
 
       //TODO Clarify is this parameter is compulsory