diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 17:13:08 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-05 17:13:08 +0000 |
| commit | 82beaca101dfb312bebfb4997d49b53848048584 (patch) | |
| tree | 85440d7eed12e10ee22bbbb1d6930952dd1e59aa | |
| parent | 520ba0e779a775127ec47ab4d6858a135ea6e9a5 (diff) | |
| download | ATCD-82beaca101dfb312bebfb4997d49b53848048584.tar.gz | |
Merged in additional changes from trunk.
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/OCI_RE_ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_enum.cpp | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp | 2 |
4 files changed, 32 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 32f48c32aba..b6a1f97540b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Feb 5 16:21:20 UTC 2013 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_enum.cpp (gen_ostream_operator): + + Fixed generation of enum value scoped name for ostreams + when the enum is nested. Closes [BUGID 4090]. + + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + + Cosmetic changes. + Tue Feb 5 13:46:00 UTC 2013 Simon Massey <simon.massey@prismtech.com> * docs/Options.html: diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog index 09887403796..74af476dd38 100644 --- a/TAO/OCI_RE_ChangeLog +++ b/TAO/OCI_RE_ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 5 17:10:58 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com> + + * TAO_IDL/be/be_enum.cpp: + * TAO_IDL/be/be_visitor_enum/enum_cs.cpp: + + Merged additional changes from trunk in preparation for merge. The + above files had changes. + Tue Feb 5 17:00:14 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com> * bin/tao_orb_tests.lst: @@ -8,9 +16,9 @@ Tue Feb 5 17:00:14 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com> * tao/GIOP_Message_Base.cpp: * tests/Bug_4082_Regression/run_test.pl: - Merged changes from trunk in preparation for merge. The + Merged changes from trunk in preparation for merge. The above files had changes. - + Mon Feb 4 22:57:48 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> * orbsvcs/Naming_Service/FT_Naming_Service.h: diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 4e01322a549..ec1570cc167 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -59,13 +59,18 @@ be_enum::gen_ostream_operator (TAO_OutStream *os, << "switch (_tao_enumerator)" << be_idt_nl << "{" << be_idt_nl; - for (int i = 0; i < this->member_count (); ++i) + // The enum's type name itself is not part of the scope of the + // enum values. If the enum is defined at global scope, this will + // produce an empty string when streamed to the output file. + UTL_ScopedName *s = ScopeAsDecl (this->defined_in ())->name (); + + for (UTL_ScopeActiveIterator i (this, IK_decls); !i.is_done (); i.next ()) { - UTL_ScopedName *mname = - this->value_to_name (static_cast<unsigned long> (i)); + Identifier *id = i.item ()->local_name (); - *os << "case " << mname << ": return strm << \"" - << mname << "\";" << be_nl; + *os << "case " << s << "::" << id + << ": return strm << \"" << s << "::" << id + << "\";" << be_nl; } *os << "default: return strm;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp index 618c865ceaf..980ac1d839a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp @@ -36,7 +36,7 @@ be_visitor_enum_cs::visit_enum (be_enum *node) if (node->cli_stub_gen () || node->imported ()) { - return 0; + return 0; } if (be_global->tc_support ()) |