diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-09-07 18:43:59 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-09-07 18:43:59 +0000 |
| commit | f1364aa08500771d47eac5d83eeb52474b8d1b97 (patch) | |
| tree | 03c22e2913d62a47c4db3aed78eec2c2a6dbd401 | |
| parent | 678d9a8050f3c5ec1d8f04c9a4eca11d607754ba (diff) | |
| download | ATCD-f1364aa08500771d47eac5d83eeb52474b8d1b97.tar.gz | |
ChangeLogTag: Fri Sep 7 18:42:26 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_enum.cpp | 16 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp | 5 |
3 files changed, 11 insertions, 20 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6576d108cfc..2e40d299477 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Sep 7 18:42:26 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp: + + Removed some experimental code that was inadvertently checked + in with + + Thu Sep 6 13:10:49 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> + Fri Sep 7 18:15:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * TAO-INSTALL.html: diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 2252349a717..07b93e88585 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -88,22 +88,6 @@ be_enum::gen_ostream_operator (TAO_OutStream *os) << "return strm;" << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}" << be_nl; - - *os << be_nl - << "std::istream& operator>> (std::istream &strm, " - << this->name () << " &_tao_enumerator)" << be_nl - << "{" << be_idt_nl - << "std::string value;" << be_nl - << "strm >> value;" << be_nl - << "for (CORBA::ULong i = 0; i < " << this->member_count () << "; ++i)" << be_idt_nl - << "{" << be_idt_nl - << "if (value == " << enumerators_name.c_str () << "[i])" << be_idt_nl - << "{" << be_idt_nl - << "_tao_enumerator = static_cast<" << this->name () << ">(i);" << be_uidt_nl - << "}" << be_uidt_nl << be_uidt_nl - << "}" << be_uidt_nl - << "return strm;" << be_uidt_nl - << "}" << be_nl; } void diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp index 1f6656ca1db..85f8cf0204c 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp @@ -64,10 +64,7 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node) *os << be_nl << be_global->stub_export_macro () << " std::ostream&" << " operator<< (std::ostream &strm, const " << node->name () - << " _tao_enumerator);" << be_nl - << be_global->stub_export_macro () << " std::istream&" - << " operator>> (std::istream &strm, " << node->name () - << " &_tao_enumerator);" << be_nl; + << " _tao_enumerator);" << be_nl; } *os << be_global->core_versioning_end () << be_nl; |