1 files changed, 25 insertions, 25 deletions

diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index f6372e8dc8a..e5cf61a0df2 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -104,8 +104,8 @@ IDL_GlobalData::IDL_GlobalData (void)
     pd_main_filename (0),
     pd_real_filename (0),
     pd_stripped_filename (0),
-    pd_import (I_FALSE),
-    pd_in_main_file (I_FALSE),
+    pd_import (false),
+    pd_in_main_file (false),
     pd_prog_name (0),
     pd_cpp_location (0),
     pd_compile_flags (0),
@@ -123,11 +123,11 @@ IDL_GlobalData::IDL_GlobalData (void)
     gperf_path_ (0),
     temp_dir_ (0),
     ident_string_ (0),
-    case_diff_error_ (I_TRUE),
-    nest_orb_ (I_FALSE),
+    case_diff_error_ (true),
+    nest_orb_ (false),
     idl_flags_ (""),
-    preserve_cpp_keywords_ (I_TRUE),
-    pass_orb_idl_ (I_FALSE),
+    preserve_cpp_keywords_ (true),
+    pass_orb_idl_ (false),
     using_ifr_backend_ (false),
     ignore_idl3_ (false),
     recursion_start_ (0)  // Not used by all backends.
@@ -402,33 +402,33 @@ IDL_GlobalData::set_real_filename (UTL_String *n)
 }
 
 // Get or set indicator whether import is on
-idl_bool
+bool
 IDL_GlobalData::imported (void)
 {
-  return this->pd_in_main_file ? I_FALSE : pd_import;
+  return this->pd_in_main_file ? false : pd_import;
 }
 
-idl_bool
+bool
 IDL_GlobalData::import (void)
 {
   return this->pd_import;
 }
 
 void
-IDL_GlobalData::set_import (idl_bool is_in)
+IDL_GlobalData::set_import (bool is_in)
 {
   this->pd_import = is_in;
 }
 
 // Get or set indicator whether we're reading the main file now
-idl_bool
+bool
 IDL_GlobalData::in_main_file (void)
 {
   return this->pd_in_main_file;
 }
 
 void
-IDL_GlobalData::set_in_main_file (idl_bool is_in)
+IDL_GlobalData::set_in_main_file (bool is_in)
 {
   this->pd_in_main_file = is_in;
 }
@@ -974,24 +974,24 @@ IDL_GlobalData::ident_string (void) const
 }
 
 void
-IDL_GlobalData::case_diff_error (idl_bool val)
+IDL_GlobalData::case_diff_error (bool val)
 {
   this->case_diff_error_ = val;
 }
 
-idl_bool
+bool
 IDL_GlobalData::case_diff_error (void)
 {
   return this->case_diff_error_;
 }
 
 void
-IDL_GlobalData::nest_orb (idl_bool val)
+IDL_GlobalData::nest_orb (bool val)
 {
   this->nest_orb_ = val;
 }
 
-idl_bool
+bool
 IDL_GlobalData::nest_orb (void)
 {
   return this->nest_orb_;
@@ -1064,7 +1064,7 @@ IDL_GlobalData::destroy (void)
   this->n_included_idl_files_ = 0;
 
   this->pd_root->destroy ();
-  
+
   ACE::strdelete (this->recursion_start_);
   this->recursion_start_ = 0;
 }
@@ -1290,7 +1290,7 @@ IDL_GlobalData::stripped_preproc_include (const char *name)
  C++ keywords e.g. delete, operator etc. with _cxx_ prefix.
  Should be true when being used by the IFR Service
  */
-idl_bool
+bool
 IDL_GlobalData::preserve_cpp_keywords (void)
 {
   return preserve_cpp_keywords_;
@@ -1302,7 +1302,7 @@ IDL_GlobalData::preserve_cpp_keywords (void)
  Is unset by the tao_idl compiler.
  */
 void
-IDL_GlobalData::preserve_cpp_keywords (idl_bool val)
+IDL_GlobalData::preserve_cpp_keywords (bool val)
 {
   preserve_cpp_keywords_ = val;
 }
@@ -1319,14 +1319,14 @@ IDL_GlobalData::file_prefixes (void)
   return this->file_prefixes_;
 }
 
-idl_bool
+bool
 IDL_GlobalData::pass_orb_idl (void) const
 {
   return this->pass_orb_idl_;
 }
 
 void
-IDL_GlobalData::pass_orb_idl (idl_bool val)
+IDL_GlobalData::pass_orb_idl (bool val)
 {
   this->pass_orb_idl_ = val;
 }
@@ -1519,7 +1519,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
   UTL_ScopedName scoped_name (&module_id,
                               &local_name);
   AST_Decl *d = c->lookup_by_name (&scoped_name,
-                                   I_TRUE);
+                                   true);
   local_id.destroy ();
   module_id.destroy ();
 
@@ -1617,9 +1617,9 @@ void
 IDL_GlobalData::check_primary_keys (void)
 {
   AST_ValueType *holder = 0;
-  
+
   while (!this->primary_keys_.is_empty ())
-    {  
+    {
       // Dequeue the element at the head of the queue.
       if (this->primary_keys_.dequeue_head (holder))
         {
@@ -1686,7 +1686,7 @@ IDL_GlobalData::add_dcps_data_type(const char* id)
 
 }
 
-idl_bool
+bool
 IDL_GlobalData::add_dcps_data_key(const char* id, const char* key)
 {
   // Search the map for the type.