From 88422ea5f373f19229060f9493afa6a624a2ea54 Mon Sep 17 00:00:00 2001 From: bala Date: Mon, 21 Apr 2003 18:10:33 +0000 Subject: ChangeLogTag:Mon Apr 21 13:07:41 2003 Balachandran Natarajan --- TAO/ChangeLog_ref | 10 ++++ TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp | 65 +++++++++++----------- TAO/tao/Seq_VarOut_T.h | 29 +++++----- TAO/tao/Seq_VarOut_T.inl | 13 +---- 4 files changed, 58 insertions(+), 59 deletions(-) diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index eae6f57fc63..52d97b78013 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,13 @@ +Mon Apr 21 13:07:41 2003 Balachandran Natarajan + + * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: Dont use _slice* + as template parameters for code generation of the _var and + _out. + + * tao/Seq_VarOut_T.h: + * tao/Seq_VarOut_T.inl: Made the declarations of the operations to + be compliant with the spec. + Wed Apr 16 15:28:51 2003 Balachandran Natarajan * tao/Seq_VarOut_T.h: diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 0ca8edd7e1d..2cd857d97d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_sequence, - sequence_ch, +ACE_RCSID (be_visitor_sequence, + sequence_ch, "$Id$") // Root visitor for client header. @@ -46,7 +46,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_ch::" "visit_sequence - " - "failed creating name\n"), + "failed creating name\n"), -1); } @@ -67,7 +67,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_ch::" "visit_sequence - " - "Bad element type\n"), + "Bad element type\n"), -1); } @@ -80,7 +80,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_ch::" "visit_sequence - " - "codegen for anonymous base type failed\n"), + "codegen for anonymous base type failed\n"), -1); } } @@ -112,7 +112,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_sequence_ch::" "visit_sequence - " - "Base class name generation failed\n"), + "Base class name generation failed\n"), -1); } @@ -131,7 +131,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << node->local_name () << " (CORBA::ULong max);"; } - *os << be_nl + *os << be_nl << node->local_name () << " (" << be_idt << be_idt; if (node->unbounded ()) @@ -182,19 +182,19 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) if (bt->base_node_type () == AST_Type::NT_pre_defined) { be_typedef* alias = - be_typedef::narrow_from_decl (bt); + be_typedef::narrow_from_decl (bt); if (alias == 0) - { - predef = be_predefined_type::narrow_from_decl (bt); - } + { + predef = be_predefined_type::narrow_from_decl (bt); + } else - { - predef = + { + predef = be_predefined_type::narrow_from_decl ( alias->primitive_base_type () ); - } + } } // Now generate the extension... @@ -202,13 +202,13 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) && node->unbounded ()) { *os << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl - << node->local_name () << " (" << be_idt << be_idt_nl - << "CORBA::ULong length," << be_nl - << "const ACE_Message_Block* mb" << be_uidt_nl - << ")" << be_uidt_nl - << " : " << node->instance_name () - << " (length, mb) {}" << "\n" - << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */"; + << node->local_name () << " (" << be_idt << be_idt_nl + << "CORBA::ULong length," << be_nl + << "const ACE_Message_Block* mb" << be_uidt_nl + << ")" << be_uidt_nl + << " : " << node->instance_name () + << " (length, mb) {}" << "\n" + << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */"; } *os << be_uidt_nl @@ -220,8 +220,8 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) return 0; } -void -be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, +void +be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, be_type *elem) { TAO_OutStream *os = this->ctx_->stream (); @@ -240,7 +240,7 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, *os << elem->nested_type_name (scope, "_var") << "," << be_nl << elem->fwd_helper_name () << "_life" << be_uidt_nl << ">" << be_uidt << be_uidt_nl - << ">" << be_uidt_nl + << ">" << be_uidt_nl << node->local_name () << "_var;" << be_uidt; *os << be_nl << be_nl @@ -266,7 +266,7 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, *os << elem->nested_type_name (scope, "_var") << "," << be_nl << elem->fwd_helper_name () << "_life" << be_uidt_nl << ">" << be_uidt << be_uidt_nl - << ">" << be_uidt_nl + << ">" << be_uidt_nl << node->local_name () << "_var;" << be_uidt; *os << be_nl << be_nl @@ -291,7 +291,7 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, << elem->nested_type_name (scope) << "," << be_nl; *os << elem->nested_type_name (scope, "_var") << be_uidt_nl << ">" << be_uidt << be_uidt_nl - << ">" << be_uidt_nl + << ">" << be_uidt_nl << node->local_name () << "_var;" << be_uidt; *os << be_nl << be_nl @@ -316,7 +316,7 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, *os << elem->nested_type_name (scope, "_var") << "," << be_nl << elem->fwd_helper_name () << "_life" << be_uidt_nl << ">" << be_uidt << be_uidt_nl - << ">" << be_uidt_nl + << ">" << be_uidt_nl << node->local_name () << "_var;" << be_uidt; *os << be_nl << be_nl @@ -381,16 +381,16 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, } *os << "typedef" << be_idt_nl - << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<" + << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<" : "TAO_VarSeq_Var_T<") << be_idt << be_idt_nl << node->local_name () << "," << be_nl << elem->nested_type_name (scope); - if (nt == AST_Decl::NT_array) + /*if (nt == AST_Decl::NT_array) { *os << "_slice *"; - } + }*/ *os << be_uidt_nl << ">" << be_uidt_nl @@ -403,10 +403,10 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, << node->local_name () << "_var," << be_nl << elem->nested_type_name (scope); - if (nt == AST_Decl::NT_array) + /*if (nt == AST_Decl::NT_array) { *os << "_slice *"; - } + }*/ *os << be_uidt_nl << ">" << be_uidt_nl @@ -416,4 +416,3 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node, break; } } - diff --git a/TAO/tao/Seq_VarOut_T.h b/TAO/tao/Seq_VarOut_T.h index 7c9eb453cec..32baf4bbc8c 100644 --- a/TAO/tao/Seq_VarOut_T.h +++ b/TAO/tao/Seq_VarOut_T.h @@ -33,17 +33,17 @@ public: TAO_Seq_Var_Base_T (void); TAO_Seq_Var_Base_T (T *); TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T &); - + ~TAO_Seq_Var_Base_T (void); - + T *operator-> (void); const T *operator-> (void) const; - + operator const T &() const; operator T &(); operator T &() const; - // in, inout, out, _retn + // in, inout, out, _retn const T & in (void) const; T & inout (void); T *& out (void); @@ -70,15 +70,15 @@ public: TAO_FixedSeq_Var_T (void); TAO_FixedSeq_Var_T (T *); TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T &); - + // Fixed-size base types only. TAO_FixedSeq_Var_T (const T &); - + TAO_FixedSeq_Var_T & operator= (T *); TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T &); - + T_elem & operator[] (CORBA::ULong index); - + // Fixed-size base types only. TAO_FixedSeq_Var_T & operator= (const T &); }; @@ -97,13 +97,12 @@ public: TAO_VarSeq_Var_T (void); TAO_VarSeq_Var_T (T *); TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T &); - + TAO_VarSeq_Var_T & operator= (T *); TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T &); - + T_elem & operator[] (CORBA::ULong index); - const T_elem & operator[] (CORBA::ULong index) const; - + // Variable-size base types only. operator T *& (); }; @@ -123,10 +122,10 @@ public: TAO_MngSeq_Var_T (void); TAO_MngSeq_Var_T (T *); TAO_MngSeq_Var_T (const TAO_MngSeq_Var_T &); - + TAO_MngSeq_Var_T & operator= (T *); TAO_MngSeq_Var_T & operator= (const TAO_MngSeq_Var_T &); - + // Variable-size base types only. operator T *& (); @@ -155,7 +154,7 @@ public: T *& ptr (void); T * operator-> (void); - T_elem operator[] (CORBA::ULong index); + T_elem & operator[] (CORBA::ULong index); private: typedef TAO_Seq_Out_T THIS_OUT_TYPE; diff --git a/TAO/tao/Seq_VarOut_T.inl b/TAO/tao/Seq_VarOut_T.inl index 5d635318d00..a67dd51fcce 100644 --- a/TAO/tao/Seq_VarOut_T.inl +++ b/TAO/tao/Seq_VarOut_T.inl @@ -126,7 +126,7 @@ template ACE_INLINE TAO_FixedSeq_Var_T::TAO_FixedSeq_Var_T (const T & p) { - ACE_NEW (this->ptr_, + ACE_NEW (this->ptr_, T (p)); } @@ -194,14 +194,6 @@ TAO_VarSeq_Var_T::operator[] (CORBA::ULong index) return this->ptr_->operator[] (index); } -template -ACE_INLINE -const T_elem & -TAO_VarSeq_Var_T::operator[] (CORBA::ULong index) const -{ - return ACE_const_cast (const T_elem &, this->ptr_->operator[] (index)); -} - // *************************************************************** template @@ -320,9 +312,8 @@ TAO_Seq_Out_T::operator-> (void) template ACE_INLINE -T_elem +T_elem & TAO_Seq_Out_T::operator[] (CORBA::ULong index) { return this->ptr_->operator[] (index); } - -- cgit v1.2.1