diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-02-08 04:51:29 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-02-08 04:51:29 +0000 |
| commit | b84c19dce0a7f76085ecd69029f73326a95f8336 (patch) | |
| tree | b5835bda4fa6623e09590e04e1eb222ba17cd5c6 | |
| parent | e93201685cffc66b7a9125be1e38fc6ea7646e20 (diff) | |
| download | ATCD-b84c19dce0a7f76085ecd69029f73326a95f8336.tar.gz | |
Wed Feb 8 04:46:33 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 70fbd44c98f..8c7ccc44a9d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Feb 8 04:46:33 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> + + * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp + + Added versioned namespace macros to generation of + any insertion/extraction operators. Thanks to Ossama + Othman for pointing out this problem. + Tue Feb 7 22:40:54 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> * tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index 899854c0915..ff1c24cacc4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -85,6 +85,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; + *os << be_global->core_versioning_begin () << be_nl; be_util::gen_nested_namespace_begin (os, module); // emit nested variation of any operators @@ -99,10 +100,12 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( << node->local_name () << " *&);"; be_util::gen_nested_namespace_end (os, module); - + *os << be_global->core_versioning_end () << be_nl; // emit #else *os << "#else\n\n"; } + + *os << be_global->core_versioning_begin () << be_nl; *os << macro << " void" << " operator<<= ( ::CORBA::Any &, " << node->name () @@ -113,7 +116,8 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, " << node->name () << " *&);"; - + + *os << be_global->core_versioning_end () << be_nl; if (module != 0) { *os << "\n\n#endif"; |