diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-02-21 19:28:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-02-21 19:28:03 +0000 |
| commit | e46d2b5dc6575abc8f0c0aef92c138bdc5dcac13 (patch) | |
| tree | 10a22c230d420b293610b5d0a9da139ec1f9902b /TAO/TAO_IDL/be/be_visitor_root | |
| parent | 486e232ae8f284386802910eb914e7734c43fee1 (diff) | |
| download | ATCD-e46d2b5dc6575abc8f0c0aef92c138bdc5dcac13.tar.gz | |
Thu Feb 21 19:25:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_root')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_root/root.cpp | 21 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp | 7 |
2 files changed, 17 insertions, 11 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp index 140ef6a4a93..4ce67d3821c 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp @@ -143,15 +143,18 @@ int be_visitor_root::visit_root (be_root *node) { be_global->non_local_interfaces.dequeue_head (i); - *os << be_nl << be_nl - << "extern " << be_global->stub_export_macro () << be_nl - << "TAO::Collocation_Proxy_Broker *" << be_nl - << "(*" << i->flat_client_enclosing_scope () - << i->base_proxy_broker_name () - << "_Factory_function_pointer) (" - << be_idt << be_idt_nl - << "::CORBA::Object_ptr obj" << be_uidt_nl - << ");" << be_uidt; + if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ()) + { + *os << be_nl << be_nl + << "extern " << be_global->stub_export_macro () << be_nl + << "TAO::Collocation_Proxy_Broker *" << be_nl + << "(*" << i->flat_client_enclosing_scope () + << i->base_proxy_broker_name () + << "_Factory_function_pointer) (" + << be_idt << be_idt_nl + << "::CORBA::Object_ptr obj" << be_uidt_nl + << ");" << be_uidt; + } } size = be_global->non_defined_interfaces.size (); diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp index 26ab72be1cc..85387b345d0 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp @@ -62,12 +62,15 @@ be_visitor_root_ch::init (void) << "// " << __FILE__ << ":" << __LINE__; *os << be_global->core_versioning_begin () << be_nl; - + *os << be_nl << be_nl << "namespace TAO" << be_nl << "{" << be_idt_nl; - *os << "class Collocation_Proxy_Broker;" << be_nl; + if (be_global->gen_direct_collocation () || be_global->gen_thru_poa_collocation ()) + { + *os << "class Collocation_Proxy_Broker;" << be_nl; + } if (idl_global->abstract_iface_seen_) { |