ChangeLogTag:Wed Feb 21 20:30:34 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>

5 files changed, 18 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 79a0e7e0e57..5c95ee67105 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Feb 21 20:30:34 UTC 2007  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DynAny_Handler/DynAny_Handler.cpp
+        * CIAO_Events/CIAOEvents.hpp
+        * RT-CCM/CIAOServerResources.hpp
+        * Basic_Deployment_Data.hpp
+        
+          Compile fixes for Borland and pedantic G++ compilers. 
+
 Wed Feb 21 19:16:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/TargetManager/TargetManager.mpc:
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index dfbd20ef4c2..db41ec8348d 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -118,7 +118,7 @@ namespace CIAO
 
       enum Value
       {
-        tk_null_l,tk_void_l,tk_short_l,tk_long_l,tk_ushort_l,tk_ulong_l,tk_float_l,tk_double_l,tk_boolean_l,tk_char_l,tk_octet_l,tk_any_l,tk_TypeCode_l,tk_Principal_l,tk_objref_l,tk_struct_l,tk_union_l,tk_enum_l,tk_string_l,tk_sequence_l,tk_array_l,tk_alias_l,tk_except_l,tk_longlong_l,tk_ulonglong_l,tk_longdouble_l,tk_wchar_l,tk_wstring_l,tk_wfixed_l,tk_value_l,tk_value_box_l,tk_native_l,tk_abstract_interface_l,tk_local_interface_l,tk_component_l,tk_home_l,tk_event_l,
+        tk_null_l, tk_void_l, tk_short_l, tk_long_l, tk_ushort_l, tk_ulong_l, tk_float_l, tk_double_l, tk_boolean_l, tk_char_l, tk_octet_l, tk_any_l, tk_TypeCode_l, tk_Principal_l, tk_objref_l, tk_struct_l, tk_union_l, tk_enum_l, tk_string_l, tk_sequence_l, tk_array_l, tk_alias_l, tk_except_l, tk_longlong_l, tk_ulonglong_l, tk_longdouble_l, tk_wchar_l, tk_wstring_l, tk_wfixed_l, tk_value_l, tk_value_box_l, tk_native_l, tk_abstract_interface_l, tk_local_interface_l, tk_component_l, tk_home_l, tk_event_l
       };
 
 
@@ -882,7 +882,7 @@ namespace CIAO
 
       enum Value
       {
-        Quantity_l,Capacity_l,Minimum_l,Maximum_l,Attribute_l,Selection_l,
+        Quantity_l, Capacity_l, Minimum_l, Maximum_l, Attribute_l, Selection_l
       };
 
 
@@ -1365,7 +1365,7 @@ namespace CIAO
 
       enum Value
       {
-        None_l,InstanceUsesResource_l,ResourceUsesInstance_l,PortUsesResource_l,ResourceUsesPort_l,
+        None_l, InstanceUsesResource_l, ResourceUsesInstance_l, PortUsesResource_l, ResourceUsesPort_l
       };
 
 
@@ -1571,7 +1571,7 @@ namespace CIAO
 
       enum Value
       {
-        Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l,
+        Facet_l, SimplexReceptacle_l, MultiplexReceptacle_l, EventEmitter_l, EventPublisher_l, EventConsumer_l
       };
 
 
diff --git a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
index 8ca8e521268..d94aab6d032 100644
--- a/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+++ b/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
@@ -57,7 +57,7 @@ namespace CIAO
 
       enum Value
       {
-        EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l,
+        EC_l, RTEC_l, NOTIFY_l, RTNOTIFY_l
       };
 
 
@@ -268,7 +268,7 @@ namespace CIAO
 
       enum Value
       {
-        CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l,
+        CONJUNCTION_l, DISJUNCTION_l, LOGICAL_AND_l, NEGATE_l
       };
 
 
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index 64690ad61c1..24a12b6d2e9 100644
--- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
+++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
@@ -165,7 +165,7 @@ namespace CIAO
       DynamicAny::DynAny_var dyn = this->daf_->create_dyn_any (any);
 
       DataValue val;
-
+      /*
       switch (dyn->type ()->kind ())
         {
         case CORBA::tk_short:
@@ -234,7 +234,7 @@ namespace CIAO
           ACE_ERROR ((LM_ERROR, "DynAny_Handler: I have no idea how to perform a referse mapping.\n"));
           throw 1;
         }
-
+      */
     }
   }
 }
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index d08ff32fc10..2a0f3a8bcc1 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -709,7 +709,7 @@ namespace CIAO
 
       enum Value
       {
-        SERVER_DECLARED_l,CLIENT_PROPAGATED_l,
+        SERVER_DECLARED_l, CLIENT_PROPAGATED_l
       };