ChangeLogTag : Thu Feb 22 22:53:52 UTC 2007 Nilabja R <nilabjar@dre.vanderbilt.edu>

2 files changed, 35 insertions, 30 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 209d0fa7b8a..0e126b20bf2 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,18 +1,23 @@
+Thu Feb 22 22:53:52 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+
+        * DAnCE/TargetManager/CmpClient.cpp:
+				  Changed in order to remove a warning in the build
+
 Thu Feb 22 22:22:13 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * examples/Hello/descriptors_RTCCM/rt-example.cdp:
-        
+
           Updated the RT-CCM example deployment plan to conform
           to the latest changes in specifying the POA policies
           within the deployment plan.
-        
+
           The POA policies now need to be specified with a tag name
           as CIAO:InstancePolicy.
 
 Thu Feb 22 22:19:14 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        
+
           Modifications to read in DiffServ policy specifications
           within the deployment plan.
 
@@ -47,35 +52,35 @@ Thu Feb 22 22:18:24 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
         * CCF/CCF/IDL3/SemanticAction/HomeFactory.hpp
         * CCF/CCF/IDL3/SemanticAction/HomeFinder.hpp
         * CCF/CCF/IDL3/SemanticAction/Emits.hpp
-        
+
           Addressed warnings relating to classes w/ virtual methods having
           non virtual destructors.
 
 Thu Feb 22 21:36:35 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
-        
-          Fix for compile warning. 
-        
+
+          Fix for compile warning.
+
         * tools/Config_Handlers/Basic_Deployment_Data.cpp
         * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
         * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
         * tools/Config_Handlers/Basic_Deployment_Data.hpp
 
           Regenerated with newer version of XSC than Jai had, re-applying
-          fixes from 
+          fixes from
           Wed Feb 21 20:30:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
-        
+
 Thu Feb 22 17:07:08 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp:
-        
+
           Removed a unused input argument from cnw_priority_pd () method.
 
 Thu Feb 22 02:30:29 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * DAnCE/Deployment/CIAO_ServerResources.idl:
-        
+
           Modified the IDL to conform to the changes made in the
           schema.
 
@@ -85,44 +90,44 @@ Thu Feb 22 02:27:00 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
         * tools/Config_Handlers/RT-CCM/CNPM_Handler.cpp:
         * tools/Config_Handlers/RT-CCM/NPM_Handler.h:
         * tools/Config_Handlers/RT-CCM/NPM_Handler.cpp:
-        
+
           New config handlers for handling the DiffServ policy
           additions in the CIAOServerResources schema.
-        
+
         * tools/Config_Handlers/RT-CCM/PS_Handler.cpp:
-        
+
           PolicySet within the CIAOServerResources schema will now
           have DiffServ policy specify sub-elements. So the PolicySet
           handler is modified to call the specific handlers checked-in
           above.
-        
+
         * tools/Config_Handlers/RT-CCM/RT-CCM-Handlers.mpc:
-        
+
           Included the new files in the MPC.
 
 Thu Feb 22 01:26:05 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * docs/schema/CIAOServerResources.xsd:
-        
+
           Added elements for representing the DiffServ policy.
-        
+
         * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp:
         * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp:
-        
+
           Associated config handlers change.
 
 Wed Feb 21 22:01:45 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
         * docs/schema/Basic_Deployment_Data.xsd:
-        
+
           Updated the InstanceDeploymentDescription element's
           deployedResource sub-element to be a sequence.
-        
+
         * tools/Config_Handlers/Basic_Deployment_Data.cpp:
         * tools/Config_Handlers/IRDD_Handler.h:
         * tools/Config_Handlers/Basic_Deployment_Data.hpp:
         * tools/Config_Handlers/IDD_Handler.cpp:
-        
+
           Associated config handler changes.
 
 Wed Feb 21 20:30:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
@@ -131,8 +136,8 @@ Wed Feb 21 20:30:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
         * CIAO_Events/CIAOEvents.hpp
         * RT-CCM/CIAOServerResources.hpp
         * Basic_Deployment_Data.hpp
-        
-          Compile fixes for Borland and pedantic G++ compilers. 
+
+          Compile fixes for Borland and pedantic G++ compilers.
 
 Wed Feb 21 19:16:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/CIAO/DAnCE/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index dd33cf71256..de1e60fb29d 100644
--- a/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
@@ -163,7 +163,7 @@ namespace TM_Tester
               resource_seq[e.index].resourceName.in (),
               e.propertyName.in ()));
       }
-      catch(const CORBA::Exception & ex)
+      catch(const CORBA::Exception &)
       {
         ACE_ERROR ((LM_ERROR, "Error:TargetManager:commitResources Exception\n"));
         ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
@@ -187,7 +187,7 @@ namespace TM_Tester
       {
         ACE_ERROR ((LM_ERROR, "Error:TargetManager releaseResources ResourceNotAvailable Exception\n"));
       }
-      catch(const CORBA::Exception & ex)
+      catch(const CORBA::Exception &)
       {
         ACE_ERROR ((LM_ERROR, "Error:TargetManager:releaseResources Exception\n"));
         ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
@@ -216,7 +216,7 @@ namespace TM_Tester
           {
             ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
           }
-          catch(CORBA::Exception & ex)
+          catch(CORBA::Exception &)
           {
             ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
             ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
@@ -232,7 +232,7 @@ namespace TM_Tester
           {
             ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
           }
-          catch(CORBA::Exception & ex)
+          catch(CORBA::Exception &)
           {
             ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA Generic Exception\n"));
             ACE_ERROR ((LM_ERROR, "Error:TargetManager:Exception in UpdateDomain call"));
@@ -254,7 +254,7 @@ namespace TM_Tester
       {
         ACE_ERROR ((LM_ERROR, "Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
       }
-      catch(CORBA::Exception & ex)
+      catch(CORBA::Exception &)
       {
         ACE_ERROR ((LM_ERROR ,"Error:TargetManager:CORBA Generic Exception\n"));
         ACE_ERROR ((LM_ERROR,  "Error:TargetManager:Exception in TargetManager call\n"));
@@ -263,7 +263,7 @@ namespace TM_Tester
       // Finally destroy the ORB
       orb->destroy ();
     }
-    catch (CORBA::Exception & ex)
+    catch (CORBA::Exception &)
     {
       ACE_ERROR ((LM_ERROR,  "Error:TargetManager:CORBA exception raised!\n"));
     }