diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-09 21:30:38 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-09 21:30:38 +0000 |
| commit | 377b17d21850596ea40b086779af2cb84f707948 (patch) | |
| tree | b8b121a7d39d81d4e42b9a357e75c22899a684bf | |
| parent | ef2c7ddde0f8a505bf3841a9d4bd9bbd5b8f2968 (diff) | |
| download | ATCD-377b17d21850596ea40b086779af2cb84f707948.tar.gz | |
ChangeLogTag:Fri Jul 09 16:12:32 1999 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp | 23 |
2 files changed, 16 insertions, 9 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index f3c758081c7..9b5c9266260 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -53,7 +53,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) os->indent (); // Generate the stub factory function pointer definition. - *os << node->name () << "_ptr (*"; + *os << "extern " << node->name () << "_ptr (*"; *os << "_TAO_collocation_" << node->flatname () << "_Stub_Factory_function_pointer) (" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index e721c00e90b..4443ca6472d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -89,11 +89,16 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "void *servant = ACE_reinterpret_cast (void*, obj->_servant ());" << be_nl << "if (servant != 0)" << be_idt_nl << "return new " << node->full_coll_name (be_interface::DIRECT) - << " (ACE_reinterpret_cast (" << node->full_skel_name () << "*, servant)" - << ", stub);" << be_uidt << be_uidt_nl << "}" << be_uidt_nl; - - *os << "break;" << be_uidt_nl << "default:" << be_idt_nl << "break;" << be_uidt_nl - << "}" << be_uidt_nl << "return 0;" << be_uidt_nl << "}\n\n"; + << " (ACE_reinterpret_cast (" << node->full_skel_name () + << "*, servant), stub);" << be_uidt << be_uidt_nl + << "}" << be_uidt_nl; + + *os << "break;" << be_uidt_nl + << "default:" << be_idt_nl + << "break;" << be_uidt_nl + << "}" << be_uidt_nl + << "return 0;" << be_uidt_nl + << "}\n\n"; *os << "int _TAO_collocation_POA_" << node->flatname () << "_Stub_Factory_Initializer" @@ -106,11 +111,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "_Stub_Factory;" << be_uidt_nl << be_nl << "return 0;" << be_uidt_nl << "}\n\n"; - *os << "int _TAO_collocation_POA_" << node->flatname () + *os << "static int _TAO_collocation_POA_" << node->flatname () << "_Stub_Factory_Initializer_Scarecrow = " << be_idt_nl << "_TAO_collocation_POA_" << node->flatname () - << "_Stub_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_collocation_POA_" - << node->flatname () << "_Stub_Factory_Initializer));" << be_uidt_nl; + << "_Stub_Factory_Initializer (ACE_reinterpret_cast " + << "(long, _TAO_collocation_POA_" + << node->flatname () << "_Stub_Factory_Initializer));" + << be_uidt_nl; os->incr_indent (0); |