From 04095e3480514ab296b27d904fe9ac93048cba99 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Thu, 15 Jun 2006 12:34:42 +0000 Subject: ChangeLog tag: Thu Jun 15 12:32:58 UTC 2006 Phil Mesnier --- TAO/ChangeLog | 7 ++++++ TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp | 26 +++------------------- TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp | 18 +++++++++++++++ 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 14d809cc1d4..d84bf9df032 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 15 12:32:58 UTC 2006 Phil Mesnier + + * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp: + * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp: + + Moved virtual methods from inline to out-of-line. + Wed Jun 14 14:48:07 UTC 2006 Wallace Zhang * tests/ORB_Local_Config/ORB_Local_Config.mwc: diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index c5806a4efb0..d78920093c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -56,24 +56,10 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node) -1); } - *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ << be_nl; + // there is currently nothing to output at this point, but I don't + // want to take out this function at this time. + ACE_UNUSED_ARG (os); - *os << "ACE_INLINE const char* " << be_nl - << node->name () << "::_tao_obv_static_repository_id ()" << be_nl - << "{" << be_idt_nl - << "return \"" << node->repoID () << "\";" << be_uidt_nl - << "}" << be_nl << be_nl; - - // _tao_match_formal_type method. Generated because ValueBase interface - // requires it. Since value boxes do not support inheritence, this can - // simply return true. - *os << "ACE_INLINE ::CORBA::Boolean " << be_nl - << node->name () - << "::_tao_match_formal_type (ptrdiff_t ) const" << be_nl - << "{" << be_idt_nl - << "return true;" << be_uidt_nl - << "}" << be_nl << be_nl; // Indicate that code is already generated for this node. node->cli_inline_gen (true); @@ -99,12 +85,6 @@ be_visitor_valuebox_ci::visit_array (be_array *node) << "this->_pd_value = " << node->full_name () << "_alloc ();" << be_uidt_nl << "}" << be_nl << be_nl; - // Protected destructor - *os << "ACE_INLINE" << be_nl - << vb_node->name () << "::~" << vb_node->local_name () << " (void)" - << be_nl << "{" << be_nl - << "}" << be_nl << be_nl; - // Public constructor that takes a const array argument *os << "ACE_INLINE" << be_nl << vb_node->name () << "::" << vb_node->local_name () << " (const " 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 91218d66de0..d8b9bce792c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -122,12 +122,28 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl << "}" << be_nl << be_nl; + *os << "const char* " << be_nl + << node->name () << "::_tao_obv_static_repository_id ()" << be_nl + << "{" << be_idt_nl + << "return \"" << node->repoID () << "\";" << be_uidt_nl + << "}" << be_nl << be_nl; + *os << "void" << be_nl << node->name () << "::_tao_obv_truncatable_repo_ids (Repository_Id_List& ids) const" << be_nl << "{" << be_idt_nl << "ids.push_back (this->_tao_obv_static_repository_id ());" << be_uidt_nl << "}" << be_nl << be_nl; + // _tao_match_formal_type method. Generated because ValueBase interface + // requires it. Since value boxes do not support inheritence, this can + // simply return true. + *os << "::CORBA::Boolean " << be_nl + << node->name () + << "::_tao_match_formal_type (ptrdiff_t ) const" << be_nl + << "{" << be_idt_nl + << "return true;" << be_uidt_nl + << "}" << be_nl << be_nl; + AST_Type * at = node->boxed_type()->unaliased_type(); be_type *bt = be_type::narrow_from_decl (at); bool is_array = false; @@ -247,6 +263,8 @@ be_visitor_valuebox_cs::visit_array (be_array * node) os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; + this->emit_destructor (); + // _tao_marshal_v method os << "::CORBA::Boolean " << be_nl << vb_node->name () -- cgit v1.2.1