diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-03-31 13:16:29 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-03-31 13:16:29 +0000 |
| commit | a5a210d593c9e507e38429ba6115ee3d7515c0cf (patch) | |
| tree | 286526d62c1e175ec052fc3377a1cf13fa49e9c5 | |
| parent | 86979737c1885a63ca2fea2de74d69a585f7d40b (diff) | |
| download | ATCD-a5a210d593c9e507e38429ba6115ee3d7515c0cf.tar.gz | |
ChangeLogTag: Wed Mar 31 13:15:05 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c4a46155f58..bb3b9869644 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 31 13:15:05 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_root/root_cs.cpp: + + Fixed bug in generation of *A.cpp file when versioning + macros are specified. + Wed Mar 31 11:28:14 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> * tests/OBV/TC_Alignment/run_test.pl: diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp index e7c4eb731ee..14ddf78de94 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp @@ -140,15 +140,15 @@ be_visitor_root_cs::gen_obv_defns (be_root *node) int be_visitor_root_cs::gen_any_ops (be_root *node) { - if (! be_global->any_support ()) + int status = 0; + + if (be_global->any_support ()) { - return 0; + be_visitor_context ctx = *this->ctx_; + ctx.state (TAO_CodeGen::TAO_ROOT_ANY_OP_CS); + be_visitor_root_any_op any_op_visitor (&ctx); + status = node->accept (&any_op_visitor); } - - be_visitor_context ctx = *this->ctx_; - ctx.state (TAO_CodeGen::TAO_ROOT_ANY_OP_CS); - be_visitor_root_any_op any_op_visitor (&ctx); - int status = node->accept (&any_op_visitor); /// Conditional switch to the *A.cpp stream is done /// in the visitor constructor. |