diff options
-rw-r--r-- | TAO/ChangeLog | 12 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp | 3 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1773d8f7c27..268faf6ee67 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Mon Jul 7 11:14:02 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp (visit_enum): + + Fixed a cut and paste error that was causing the code generation + for the any operators in the stub source file to be skipped. Thanks + to <dyafe@itgil.com> for reporting the bug. + + * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp: + + Fixed cut and paste error in the explicit template instantiation. + Mon Jul 07 07:46:00 2003 Justin Michel <michel_j@ociweb.com> * examples/RTCORBA/Activity/Activity.cpp diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index 486d84ba535..38ea4d3d063 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -88,8 +88,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << be_uidt_nl << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl << "# pragma instantiate TAO::Any_Basic_Impl_T<" - << node->name () << " \\" - << ">" << be_nl + << node->name () << ">" << be_nl << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */"; node->cli_stub_any_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index 8d99ac4abaf..cda0b48bcfc 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -192,7 +192,7 @@ be_visitor_structure_any_op_cs::visit_union (be_union *node) int be_visitor_structure_any_op_cs::visit_enum (be_enum *node) { - if (node->cli_hdr_any_op_gen () + if (node->cli_stub_any_op_gen () || node->imported ()) { return 0; |