1 files changed, 1 insertions, 47 deletions

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 ed167664904..bd821693e32 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -59,8 +59,6 @@ be_visitor_root_ch::visit_root (be_root *node)
         }
     }
 
-  this->gen_proxy_broker_factory_pointers ();
-
   this->gen_ref_counting_overrides ();
 
   this->gen_static_corba_overrides ();
@@ -153,12 +151,10 @@ be_visitor_root_ch::gen_arg_traits (be_root *node)
 void
 be_visitor_root_ch::gen_fwd_decls (void)
 {
-  // If this IDL file contains an non local interface declaration, generate a
-  // forward declaration of the proxy broker for a possible collocated call.
   if (idl_global->non_local_iface_seen_)
     {
       *o_ << be_nl_2
-          << "// TAO_IDL - Generated from " << be_nl
+          << "// TAO_IDL - Generated from" << be_nl
           << "// " << __FILE__ << ":" << __LINE__;
 
       *o_ << be_global->core_versioning_begin () << be_nl;
@@ -167,11 +163,6 @@ be_visitor_root_ch::gen_fwd_decls (void)
           << "namespace TAO" << be_nl
           << "{" << be_idt_nl;
 
-     if (be_global->gen_direct_collocation () || be_global->gen_thru_poa_collocation ())
-       {
-         *o_ << "class Collocation_Proxy_Broker;" << be_nl;
-       }
-
       if (idl_global->abstract_iface_seen_)
         {
           *o_ << "template<typename T> class AbstractBase_Narrow_Utils;" << be_nl;
@@ -185,43 +176,6 @@ be_visitor_root_ch::gen_fwd_decls (void)
 }
 
 void
-be_visitor_root_ch::gen_proxy_broker_factory_pointers (void)
-{
-  size_t size = be_global->non_local_interfaces.size ();
-
-  if (size == 0)
-    {
-      return;
-    }
-
-  size_t index = 0;
-  be_interface *i = 0;
-
-  *o_ << be_nl_2
-      << "// Proxy Broker Factory function pointer declarations."
-      << be_nl_2
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  for (index = 0; index < size; ++index)
-    {
-      be_global->non_local_interfaces.dequeue_head (i);
-
-      if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
-        {
-          *o_ << be_nl_2
-              << "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 << be_uidt;
-        }
-    }
-}
-
-void
 be_visitor_root_ch::gen_ref_counting_overrides (void)
 {
   size_t size = be_global->non_defined_interfaces.size ();