diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-23 18:49:35 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-23 18:49:35 +0000 |
| commit | af6316f3aeccc8beffb23e08e515a5c7dcb44337 (patch) | |
| tree | 3d46e4cdced1b7240b35272f469cfbe1cb7ea57d /TAO/TAO_IDL/be/be_visitor_valuetype | |
| parent | 5682f9e684333eefcc933576da0955f8eaf0a70f (diff) | |
| download | ATCD-af6316f3aeccc8beffb23e08e515a5c7dcb44337.tar.gz | |
Wed Dec 23 18:48:31 UTC 2009 Yan Dai <dai_y@ociweb.com>
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_valuetype')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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 |