Mon Jul 20 07:02:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ciao/ComponentServer/Configurators/Server_Configurator.cpp:
        * ciao/ComponentServer/Configurators/Server_Configurator.h:
          Use bool for rt_support_ and added a default value to the constructor
          to resolve problems with older gcc versions

3 files changed, 19 insertions, 14 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 85457174991..3f8562635af 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 20 07:02:47 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/ComponentServer/Configurators/Server_Configurator.cpp:
+        * ciao/ComponentServer/Configurators/Server_Configurator.h:
+          Use bool for rt_support_ and added a default value to the constructor
+          to resolve problems with older gcc versions
+
 Sun Jul 19 18:25:47 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/Logger/Logger_Service.cpp:
diff --git a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp b/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp
index 406817972de..a3138f1a038 100755
--- a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp
+++ b/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.cpp
@@ -9,7 +9,7 @@ namespace CIAO
 {
   namespace Deployment
   {
-    
+
     ComponentServer_Configurator::ComponentServer_Configurator (bool rt)
       : rt_support_ (rt)
     {
@@ -23,9 +23,9 @@ namespace CIAO
     void
     ComponentServer_Configurator::set_rt_support (void)
     {
-      this->rt_support_ = 1;
+      this->rt_support_ = true;
     }
-    
+
     bool
     ComponentServer_Configurator::rt_support (void)
     {
@@ -58,7 +58,7 @@ namespace CIAO
         this->config_dll_.symbol (ACE_TEXT ("create_basic_config_manager"));
 
       ptrdiff_t tmp = reinterpret_cast<ptrdiff_t> (void_ptr);
-      
+
       // "id" is for na_intelligent-designer.
       na_intelligent_designer config_id =
         reinterpret_cast<na_intelligent_designer> (tmp);
@@ -150,13 +150,13 @@ namespace CIAO
       this->orb_ = CORBA::ORB::_duplicate (o);
 
       (*this->na_config_manager_.get ()).init (this->orb_.in ());
-      if (this->rt_support_ == 1)
+      if (this->rt_support_)
         {
           (*this->rt_config_manager_.get ()).init (this->orb_.in ());
         }
 
       (*this->na_config_manager_.get ()).post_orb_initialize (this->orb_.in ());
-      if (this->rt_support_ == 1)
+      if (this->rt_support_)
         {
           (*this->rt_config_manager_.get ()).post_orb_initialize (this->orb_.in ());
         }
@@ -178,7 +178,7 @@ namespace CIAO
                   (*this->na_config_manager_.get ()).
                     init_resources (*svr_resource);
 
-                  if (this->rt_support_ == 1)
+                  if (this->rt_support_)
                     {
                       (*this->rt_config_manager_.get ()).
                         init_resources (*svr_resource);
@@ -223,7 +223,7 @@ namespace CIAO
                       p_length = configured_policies->length ();
                     }
 
-                  if (this->rt_support_ == 1)
+                  if (this->rt_support_)
                     {
                       rt_configured_policies = (*this->rt_config_manager_.get ()).
                         find_policies_by_name (policy_name);
@@ -281,7 +281,7 @@ namespace CIAO
           p_length = configured_policies->length ();
         }
 
-      if (this->rt_support_ == 1)
+      if (this->rt_support_)
         {
           rt_configured_policies = (*this->rt_config_manager_.get ()).
             find_policies_by_name (policy_name);
@@ -322,7 +322,7 @@ namespace CIAO
 
       if (result == false)
         {
-          if (this->rt_support_ == 1)
+          if (this->rt_support_)
             {
               result = (*this->rt_config_manager_.get ()).
                 policy_exists (policy_set_id);
diff --git a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h b/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h
index 0943afb71ac..c12e34522e2 100644
--- a/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h
+++ b/CIAO/ciao/ComponentServer/Configurators/Server_Configurator.h
@@ -43,7 +43,7 @@ namespace CIAO
     public:
 
       /// Default constructor.
-      ComponentServer_Configurator (bool rt);
+      ComponentServer_Configurator (bool rt = false);
 
       /// Default destructor.
       virtual ~ComponentServer_Configurator (void);
@@ -75,7 +75,6 @@ namespace CIAO
       /// @@ Perhaps we also need a finalizer method here.  Perhaps we
       /// even need to differentiate finalizer before ORB is destroyed
       /// and the one after that.
-
       bool rt_support (void);
 
       void set_rt_support (void);
@@ -88,8 +87,7 @@ namespace CIAO
         find_policies_by_name (const char *name);
 
     protected:
-
-      int rt_support_;
+      bool rt_support_;
 
       CORBA::ORB_var orb_;