ChangeLogTag:Thu Feb 22 21:36:35 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>

6 files changed, 87 insertions, 74 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 4219a64680c..94522a4cff6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+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. 
+        
+        * 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 
+          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:
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index a56f5d9507e..27682fe0351 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -3237,37 +3237,32 @@ namespace CIAO
 
     // InstanceDeploymentDescription
     // 
-    InstanceDeploymentDescription::deployedResource_iterator
-InstanceDeploymentDescription::
+    InstanceDeploymentDescription::deployedResource_iterator InstanceDeploymentDescription::
     begin_deployedResource ()
     {
       return deployedResource_.begin ();
     }
 
-    InstanceDeploymentDescription::deployedResource_iterator
-InstanceDeploymentDescription::
+    InstanceDeploymentDescription::deployedResource_iterator InstanceDeploymentDescription::
     end_deployedResource ()
     {
       return deployedResource_.end ();
     }
 
-    InstanceDeploymentDescription::deployedResource_const_iterator
-InstanceDeploymentDescription::
+    InstanceDeploymentDescription::deployedResource_const_iterator InstanceDeploymentDescription::
     begin_deployedResource () const
     {
       return deployedResource_.begin ();
     }
 
-    InstanceDeploymentDescription::deployedResource_const_iterator
-InstanceDeploymentDescription::
+    InstanceDeploymentDescription::deployedResource_const_iterator InstanceDeploymentDescription::
     end_deployedResource () const
     {
       return deployedResource_.end ();
     }
 
     void InstanceDeploymentDescription::
-    add_deployedResource
-(::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
+    add_deployedResource (::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& e)
     {
       deployedResource_.push_back (e);
     }
@@ -11616,8 +11611,7 @@ namespace CIAO
       {
         // VC6 anathema strikes again
         //
-        InstanceDeploymentDescription::Type::deployedResource_iterator b
-(o.begin_deployedResource()), e (o.end_deployedResource());
+        InstanceDeploymentDescription::Type::deployedResource_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
         if (b != e)
         {
@@ -11639,8 +11633,7 @@ namespace CIAO
       {
         // VC6 anathema strikes again
         //
-        InstanceDeploymentDescription::Type::deployedResource_const_iterator b
-(o.begin_deployedResource()), e (o.end_deployedResource());
+        InstanceDeploymentDescription::Type::deployedResource_const_iterator b (o.begin_deployedResource()), e (o.end_deployedResource());
 
         if (b != e)
         {
@@ -15552,8 +15545,7 @@ namespace CIAO
       void InstanceDeploymentDescription::
       deployedResource_pre (Type const&)
       {
-        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_
-()));
+        push_ (::XSCRT::XML::Element< ACE_TCHAR > ("deployedResource", top_ ()));
       }
 
       void InstanceDeploymentDescription::
diff --git a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index b56463791a3..72e3893f730 100644
--- a/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -7096,7 +7096,7 @@ namespace CIAO
         virtual void
         configProperty_post (Type const&);
 
-        virtual void
+        virtual void 
         deployedResource_pre (Type &o)
         {
 
@@ -7107,7 +7107,7 @@ namespace CIAO
         virtual void
         deployedResource_pre (Type const&);
 
-        virtual void
+        virtual void 
         deployedResource_next (Type &o)
         {
 
@@ -7118,7 +7118,7 @@ namespace CIAO
         virtual void
         deployedResource_next (Type const&);
 
-        virtual void
+        virtual void 
         deployedResource_post (Type &o)
         {
 
diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp
index 24a12b6d2e9..64690ad61c1 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.cpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index 863000c3717..5a495c966c2 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -1424,7 +1424,7 @@ namespace CIAO
     }
 
     // PolicySet
-    //
+    // 
     PolicySet::nwpriorityModel_iterator PolicySet::
     begin_nwpriorityModel ()
     {
@@ -1462,7 +1462,7 @@ namespace CIAO
     }
 
     // PolicySet
-    //
+    // 
     PolicySet::cnwpriorityModel_iterator PolicySet::
     begin_cnwpriorityModel ()
     {
@@ -1639,7 +1639,7 @@ namespace CIAO
     }
 
     // NWPriorityModel
-    //
+    // 
 
     NWPriorityModel::Value NWPriorityModel::
     integral () const
@@ -1751,15 +1751,16 @@ namespace CIAO
       }
     }
 
+
     // NWPriorityModelPolicyDef
-    //
+    // 
 
     NWPriorityModelPolicyDef::
     NWPriorityModelPolicyDef (::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model__,
                               ::XMLSchema::long_ const& request_dscp__,
                               ::XMLSchema::long_ const& reply_dscp__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     nw_priority_model_ (new ::CIAO::Config_Handlers::NWPriorityModel (nw_priority_model__)),
     request_dscp_ (new ::XMLSchema::long_ (request_dscp__)),
     reply_dscp_ (new ::XMLSchema::long_ (reply_dscp__)),
@@ -1796,8 +1797,9 @@ namespace CIAO
       return *this;
     }
 
+
     // NWPriorityModelPolicyDef
-    //
+    // 
     ::CIAO::Config_Handlers::NWPriorityModel const& NWPriorityModelPolicyDef::
     nw_priority_model () const
     {
@@ -1811,7 +1813,7 @@ namespace CIAO
     }
 
     // NWPriorityModelPolicyDef
-    //
+    // 
     ::XMLSchema::long_ const& NWPriorityModelPolicyDef::
     request_dscp () const
     {
@@ -1825,7 +1827,7 @@ namespace CIAO
     }
 
     // NWPriorityModelPolicyDef
-    //
+    // 
     ::XMLSchema::long_ const& NWPriorityModelPolicyDef::
     reply_dscp () const
     {
@@ -1840,13 +1842,13 @@ namespace CIAO
 
 
     // CNWPriorityModelPolicyDef
-    //
+    // 
 
     CNWPriorityModelPolicyDef::
     CNWPriorityModelPolicyDef (::XMLSchema::long_ const& request_dscp__,
                                ::XMLSchema::long_ const& reply_dscp__)
-    :
-    ::XSCRT::Type (),
+    : 
+    ::XSCRT::Type (), 
     request_dscp_ (new ::XMLSchema::long_ (request_dscp__)),
     reply_dscp_ (new ::XMLSchema::long_ (reply_dscp__)),
     regulator__ ()
@@ -1877,8 +1879,9 @@ namespace CIAO
       return *this;
     }
 
+
     // CNWPriorityModelPolicyDef
-    //
+    // 
     ::XMLSchema::long_ const& CNWPriorityModelPolicyDef::
     request_dscp () const
     {
@@ -1892,7 +1895,7 @@ namespace CIAO
     }
 
     // CNWPriorityModelPolicyDef
-    //
+    // 
     ::XMLSchema::long_ const& CNWPriorityModelPolicyDef::
     reply_dscp () const
     {
@@ -2481,7 +2484,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
       else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
-      else
+      else 
       {
       }
     }
@@ -2494,7 +2497,7 @@ namespace CIAO
 
       if (v == "SERVER_DECLARED_NWPRIORITY") v_ = SERVER_DECLARED_NWPRIORITY_l;
       else if (v == "CLIENT_PROPAGATED_NWPRIORITY") v_ = CLIENT_PROPAGATED_NWPRIORITY_l;
-      else
+      else 
       {
       }
     }
@@ -2577,7 +2580,7 @@ namespace CIAO
           reply_dscp_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -2610,7 +2613,7 @@ namespace CIAO
           reply_dscp_->container (this);
         }
 
-        else
+        else 
         {
         }
       }
@@ -5031,7 +5034,7 @@ namespace CIAO
         dispatch (o.reply_dscp ());
       }
 
-       void CNWPriorityModelPolicyDef::
+      void CNWPriorityModelPolicyDef::
       post (Type&)
       {
       }
@@ -5811,7 +5814,7 @@ namespace CIAO
 
         if (o == ::CIAO::Config_Handlers::NWPriorityModel::SERVER_DECLARED_NWPRIORITY) s = "SERVER_DECLARED_NWPRIORITY";
         else if (o == ::CIAO::Config_Handlers::NWPriorityModel::CLIENT_PROPAGATED_NWPRIORITY) s = "CLIENT_PROPAGATED_NWPRIORITY";
-        else
+        else 
         {
         }
 
@@ -5983,8 +5986,7 @@ namespace CIAO
       virtual ::CIAO::Config_Handlers::Writer::PriorityModel,
       virtual ::CIAO::Config_Handlers::Writer::NWPriorityModelPolicyDef,
       virtual ::CIAO::Config_Handlers::Writer::NWPriorityModel,
-      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_,
-ACE_TCHAR >,
+      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::long_, ACE_TCHAR >,
       virtual ::CIAO::Config_Handlers::Writer::CNWPriorityModelPolicyDef,
       virtual ::XMLSchema::Writer::IDREF< ACE_TCHAR >, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
diff --git a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index ac9eec23486..f932f4faf33 100644
--- a/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -647,7 +647,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
 
       // nwpriorityModel
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef >::iterator nwpriorityModel_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef >::const_iterator nwpriorityModel_const_iterator;
@@ -662,7 +662,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::NWPriorityModelPolicyDef > nwpriorityModel_;
 
       // cnwpriorityModel
-      //
+      // 
       public:
       typedef ::std::list< ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef >::iterator cnwpriorityModel_iterator;
       typedef ::std::list< ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef >::const_iterator cnwpriorityModel_const_iterator;
@@ -765,6 +765,7 @@ namespace CIAO
 
     bool RT_CCM_Handlers_Export operator!= (PriorityModel const &a, PriorityModel const &b);
 
+
     class RT_CCM_Handlers_Export NWPriorityModel : public ::XSCRT::Type
     {
       public:
@@ -776,17 +777,17 @@ namespace CIAO
 
       enum Value
       {
-        SERVER_DECLARED_NWPRIORITY_l, CLIENT_PROPAGATED_NWPRIORITY_l,
+        SERVER_DECLARED_NWPRIORITY_l, CLIENT_PROPAGATED_NWPRIORITY_l
       };
 
 
       Value
       integral () const;
 
-      friend bool RT_CCM_Handlers_Export
+      friend bool RT_CCM_Handlers_Export 
       operator== (NWPriorityModel const& a, NWPriorityModel const& b);
 
-      friend bool RT_CCM_Handlers_Export
+      friend bool RT_CCM_Handlers_Export 
       operator!= (NWPriorityModel const& a, NWPriorityModel const& b);
 
       private:
@@ -799,6 +800,7 @@ namespace CIAO
 
     bool RT_CCM_Handlers_Export operator!= (NWPriorityModel const &a, NWPriorityModel const &b);
 
+
     class RT_CCM_Handlers_Export PriorityModelPolicyDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
@@ -837,22 +839,23 @@ namespace CIAO
       char regulator__;
     };
 
+
     class RT_CCM_Handlers_Export NWPriorityModelPolicyDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
 
       // nw_priority_model
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model () const;
-      void nw_priority_model (::CIAO::Config_Handlers::NWPriorityModel const&);
+      void nw_priority_model (::CIAO::Config_Handlers::NWPriorityModel const& );
 
       protected:
       ::std::auto_ptr< ::CIAO::Config_Handlers::NWPriorityModel > nw_priority_model_;
 
       // request_dscp
-      //
+      // 
       public:
       ::XMLSchema::long_ const& request_dscp () const;
       void request_dscp (::XMLSchema::long_ const& );
@@ -861,7 +864,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::long_ > request_dscp_;
 
       // reply_dscp
-      //
+      // 
       public:
       ::XMLSchema::long_ const& reply_dscp () const;
       void reply_dscp (::XMLSchema::long_ const& );
@@ -870,7 +873,9 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::long_ > reply_dscp_;
 
       public:
-      NWPriorityModelPolicyDef (::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model__, ::XMLSchema::long_ const& request_dscp__, ::XMLSchema::long_ const& reply_dscp__);
+      NWPriorityModelPolicyDef (::CIAO::Config_Handlers::NWPriorityModel const& nw_priority_model__,
+                                ::XMLSchema::long_ const& request_dscp__,
+                                ::XMLSchema::long_ const& reply_dscp__);
 
       NWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
       NWPriorityModelPolicyDef (NWPriorityModelPolicyDef const& s);
@@ -882,13 +887,14 @@ namespace CIAO
       char regulator__;
     };
 
+
     class RT_CCM_Handlers_Export CNWPriorityModelPolicyDef : public ::XSCRT::Type
     {
       //@@ VC6 anathema
       typedef ::XSCRT::Type Base__;
 
       // request_dscp
-      //
+      // 
       public:
       ::XMLSchema::long_ const& request_dscp () const;
       void request_dscp (::XMLSchema::long_ const& );
@@ -897,7 +903,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::long_ > request_dscp_;
 
       // reply_dscp
-      //
+      // 
       public:
       ::XMLSchema::long_ const& reply_dscp () const;
       void reply_dscp (::XMLSchema::long_ const& );
@@ -918,7 +924,6 @@ namespace CIAO
       private:
       char regulator__;
     };
-
   }
 }
 
@@ -1862,7 +1867,6 @@ namespace CIAO
         virtual void
         post (Type const&);
       };
-
     }
   }
 }
@@ -2674,7 +2678,7 @@ namespace CIAO
         virtual void
         priorityModel_post (Type const&);
 
-        virtual void
+        virtual void 
         nwpriorityModel_pre (Type &o)
         {
 
@@ -2685,7 +2689,7 @@ namespace CIAO
         virtual void
         nwpriorityModel_pre (Type const&);
 
-        virtual void
+        virtual void 
         nwpriorityModel_next (Type &o)
         {
 
@@ -2696,7 +2700,7 @@ namespace CIAO
         virtual void
         nwpriorityModel_next (Type const&);
 
-        virtual void
+        virtual void 
         nwpriorityModel_post (Type &o)
         {
 
@@ -2707,7 +2711,7 @@ namespace CIAO
         virtual void
         nwpriorityModel_post (Type const&);
 
-        virtual void
+        virtual void 
         cnwpriorityModel_pre (Type &o)
         {
 
@@ -2718,7 +2722,7 @@ namespace CIAO
         virtual void
         cnwpriorityModel_pre (Type const&);
 
-        virtual void
+        virtual void 
         cnwpriorityModel_next (Type &o)
         {
 
@@ -2729,7 +2733,7 @@ namespace CIAO
         virtual void
         cnwpriorityModel_next (Type const&);
 
-        virtual void
+        virtual void 
         cnwpriorityModel_post (Type &o)
         {
 
@@ -2839,12 +2843,12 @@ namespace CIAO
         PriorityModel ();
       };
 
-      struct NWPriorityModel : Traversal::NWPriorityModel,
+      struct NWPriorityModel : Traversal::NWPriorityModel, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         NWPriorityModel (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
@@ -2900,13 +2904,13 @@ namespace CIAO
         PriorityModelPolicyDef ();
       };
 
-      struct NWPriorityModelPolicyDef : Traversal::NWPriorityModelPolicyDef,
+      struct NWPriorityModelPolicyDef : Traversal::NWPriorityModelPolicyDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::NWPriorityModelPolicyDef Type;
         NWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2917,7 +2921,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         nw_priority_model (Type &o)
         {
 
@@ -2928,7 +2932,7 @@ namespace CIAO
         virtual void
         nw_priority_model (Type const&);
 
-        virtual void
+        virtual void 
         request_dscp (Type &o)
         {
 
@@ -2939,7 +2943,7 @@ namespace CIAO
         virtual void
         request_dscp (Type const&);
 
-        virtual void
+        virtual void 
         reply_dscp (Type &o)
         {
 
@@ -2954,13 +2958,13 @@ namespace CIAO
         NWPriorityModelPolicyDef ();
       };
 
-      struct CNWPriorityModelPolicyDef : Traversal::CNWPriorityModelPolicyDef,
+      struct CNWPriorityModelPolicyDef : Traversal::CNWPriorityModelPolicyDef, 
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::CNWPriorityModelPolicyDef Type;
         CNWPriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        virtual void 
         traverse (Type &o)
         {
 
@@ -2971,7 +2975,7 @@ namespace CIAO
         virtual void
         traverse (Type const&);
 
-        virtual void
+        virtual void 
         request_dscp (Type &o)
         {
 
@@ -2982,7 +2986,7 @@ namespace CIAO
         virtual void
         request_dscp (Type const&);
 
-        virtual void
+        virtual void 
         reply_dscp (Type &o)
         {