Wed Dec 23 18:48:31 UTC 2009 Yan Dai <dai_y@ociweb.com>

3 files changed, 25 insertions, 18 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e541f578ef7..39ae18f85c4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 23 18:48:31 UTC 2009  Yan Dai  <dai_y@ociweb.com>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+
+          Made bool changes according to ACE-guidelines.html.
+          
 Wed Dec 23 15:47:02 UTC 2009  Jeff Parsons  <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/fe/idl.yy:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
index fe063350d1d..40e6920fc84 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -133,12 +133,12 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
 
   // _tao_match_formal_type method.  Generated because ValueBase interface
   // requires it. Since value boxes do not support inheritence, this can
-  // simply return 1.
+  // simply return true.
   *os << "::CORBA::Boolean " << be_nl
       << node->name ()
       << "::_tao_match_formal_type (ptrdiff_t ) const" << be_nl
       << "{" << be_idt_nl
-      << "return 1;" << be_uidt_nl
+      << "return true;" << be_uidt_nl
       << "}" << be_nl << be_nl;
       
 
@@ -242,8 +242,8 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << node->local_name () << " *&vb_object" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "::CORBA::Boolean is_null_object = 0;" << be_nl
-      << "::CORBA::Boolean is_indirected = 0;" << be_nl
+      << "::CORBA::Boolean is_null_object = false;" << be_nl
+      << "::CORBA::Boolean is_indirected = false;" << be_nl
       << "TAO_InputCDR indrected_strm ((size_t) 0);" << be_nl
       << "if ( ::CORBA::ValueBase::_tao_validate_box_type (" << be_idt
       << be_idt << be_idt_nl
@@ -254,12 +254,12 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << be_uidt_nl
       << ") == false)" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return 0;" << be_uidt_nl
+      << "return false;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "vb_object = 0;" << be_nl
       << "if (is_null_object)"  << be_idt_nl
       << "{" << be_idt_nl
-      << "return 1;" << be_uidt_nl
+      << "return true;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "if (is_indirected)"  << be_idt_nl
       << "{" << be_idt_nl
@@ -313,7 +313,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       << node->name ()
       << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl
       << "{" << be_idt_nl
-      << "return 1;" << be_uidt_nl
+      << "return true;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Emit the type specific elements.  The visit_* methods in this
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 8569cf2d47b..11580d1c82c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -258,7 +258,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->name () << "::_tao_marshal_v (TAO_OutputCDR &) const"
           << be_nl
           << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
+          << "return true;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       // The virtual _tao_unmarshal_v method.
@@ -266,7 +266,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << node->name () << "::_tao_unmarshal_v (TAO_InputCDR &)"
           << be_nl
           << "{" << be_idt_nl
-          << "return 1;" << be_uidt_nl
+          << "return true;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       // The virtual _tao_match_formal_type method.
@@ -275,7 +275,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           << "::_tao_match_formal_type (ptrdiff_t ) const"
           << be_nl
           << "{" << be_idt_nl
-          << "return 0;"<< be_uidt_nl
+          << "return false;"<< be_uidt_nl
           << "}" << be_nl << be_nl;
 
 
@@ -285,14 +285,14 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
               << node->name () << "::_tao_marshal__" << node->flat_name ()
               << " (TAO_OutputCDR &, TAO_ChunkInfo&) const" << be_nl
               << "{" << be_idt_nl
-              << "return 1;" << be_uidt_nl
+              << "return true;" << be_uidt_nl
               << "}" << be_nl << be_nl;
 
           *os << "::CORBA::Boolean" << be_nl
               << node->name () << "::_tao_unmarshal__" << node->flat_name ()
               << " (TAO_InputCDR &, TAO_ChunkInfo&)" << be_nl
               << "{" << be_idt_nl
-              << "return 1;" << be_uidt_nl
+              << "return true;" << be_uidt_nl
               << "}" << be_nl << be_nl;
         }
     }
@@ -323,8 +323,8 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *base = 0;" << be_nl
-      << "::CORBA::Boolean is_indirected = 0;" << be_nl
-      << "::CORBA::Boolean is_null_object = 0;" << be_nl
+      << "::CORBA::Boolean is_indirected = false;" << be_nl
+      << "::CORBA::Boolean is_null_object = false;" << be_nl
       << "::CORBA::Boolean const retval =" << be_idt_nl
       << "::CORBA::ValueBase::_tao_unmarshal_pre ("
       << be_idt << be_idt_nl
@@ -336,11 +336,11 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "::CORBA::ValueBase_var owner (base);" << be_nl << be_nl
       << "if (!retval)" << be_idt_nl
-      << "return 0;" << be_uidt_nl << be_nl
+      << "return false;" << be_uidt_nl << be_nl
       << "if (is_null_object)"  << be_idt_nl
-      << "return 1;" << be_uidt_nl << be_nl
+      << "return true;" << be_uidt_nl << be_nl
       << "if (!is_indirected && base != 0 && ! base->_tao_unmarshal_v (strm))" << be_idt_nl
-      << "return 0;" << be_uidt_nl << be_nl
+      << "return false;" << be_uidt_nl << be_nl
       << "// Now base must be null or point to the unmarshaled object."
       << be_nl
       << "// Align the pointer to the right subobject." << be_nl
@@ -348,7 +348,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "if (is_indirected)" << be_idt_nl
       << "new_object->_add_ref ();" << be_uidt_nl << be_nl
       << "owner._retn ();" << be_nl
-      << "return 1;" << be_uidt_nl
+      << "return true;" << be_uidt_nl
       << "}";
 
   // If we inherit from CORBA::Object and/or CORBA::AbstractBase