1 files changed, 56 insertions, 49 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index 644cff1056b..53669d2c205 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -1,25 +1,29 @@
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+//
+// $Id$
+//
 
-#include "be_visitor_interface.h"
+ACE_RCSID (be_visitor_interface, 
+           strategized_proxy_broker_ss, 
+           "$Id$")
 
-ACE_RCSID (be_visitor_interface, base_proxy_broker_ss, "$Id$")
-
-be_visitor_interface_strategized_proxy_broker_ss::be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx)
+be_visitor_interface_strategized_proxy_broker_ss::
+be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
 {
   // No-Op.
 }
 
 
-be_visitor_interface_strategized_proxy_broker_ss::~be_visitor_interface_strategized_proxy_broker_ss (void)
+be_visitor_interface_strategized_proxy_broker_ss::
+~be_visitor_interface_strategized_proxy_broker_ss (void)
 {
   // No-Op.
 }
 
 int
-be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface *node)
+be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
+    be_interface *node
+  )
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -27,10 +31,14 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
   os->indent ();
 
   *os << be_nl
-      << "///////////////////////////////////////////////////////////////////////" << be_nl
+      << "///////////////////////////////////////////////////////////////////////" 
+      << be_nl
       << "//            Strategized Proxy Broker Implementation" << be_nl
       << "//" << be_nl << be_nl;
 
+  *os << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
   *os << "// Factory function Implementation." << be_nl
       << node->full_strategized_proxy_broker_name ()
       << " *" << node->full_strategized_proxy_broker_name () << "::the"
@@ -126,59 +134,58 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << "switch (strategy)"
       << be_idt_nl // idt = 4
       << "{" << be_nl;
-      if (be_global->gen_thru_poa_collocation ())
-        {
-        *os << "case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:"
-            << be_idt_nl // idt = 5
-            << "ACE_NEW_THROW_EX ("
-            << be_idt << be_idt_nl //idt = 7
-            << "this->proxy_cache_[strategy]," << be_nl
-            << node->full_thru_poa_proxy_impl_name () << "," << be_nl
-            << "CORBA::NO_MEMORY ()"
-            << be_uidt << be_uidt_nl // idt = 5
-            << ");" << be_nl
-            << "ACE_CHECK;" << be_nl
-            << "break;"
-            << be_nl << be_uidt_nl; // idt = 4
-          }
-
-      if (be_global->gen_direct_collocation ())
-        {
-          *os << "case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:"
-              << be_idt_nl // idt = 5
-              << "ACE_NEW_THROW_EX ("
-              << be_idt << be_idt_nl //idt = 7
-              << "this->proxy_cache_[strategy]," << be_nl
-              << node->full_direct_proxy_impl_name () << "," << be_nl
-              << "CORBA::NO_MEMORY ()"
-              << be_uidt << be_uidt_nl // idt = 5
-              << ");" << be_nl
-              << "ACE_CHECK;" << be_nl
-              << "break;"
-              << be_nl << be_uidt_nl; // idt = 4
-            }
-
-      *os << "case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:" << be_nl
-          << "default:"
+
+  if (be_global->gen_thru_poa_collocation ())
+    {
+    *os << "case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:"
+        << be_idt_nl // idt = 5
+        << "ACE_NEW_THROW_EX ("
+        << be_idt << be_idt_nl //idt = 7
+        << "this->proxy_cache_[strategy]," << be_nl
+        << node->full_thru_poa_proxy_impl_name () << "," << be_nl
+        << "CORBA::NO_MEMORY ()"
+        << be_uidt << be_uidt_nl // idt = 5
+        << ");" << be_nl
+        << "ACE_CHECK;" << be_nl
+        << "break;"
+        << be_nl << be_uidt_nl; // idt = 4
+      }
+
+  if (be_global->gen_direct_collocation ())
+    {
+      *os << "case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:"
           << be_idt_nl // idt = 5
           << "ACE_NEW_THROW_EX ("
           << be_idt << be_idt_nl //idt = 7
           << "this->proxy_cache_[strategy]," << be_nl
-          << "::" << node->full_remote_proxy_impl_name () << "," << be_nl
+          << node->full_direct_proxy_impl_name () << "," << be_nl
           << "CORBA::NO_MEMORY ()"
           << be_uidt << be_uidt_nl // idt = 5
           << ");" << be_nl
           << "ACE_CHECK;" << be_nl
           << "break;"
-          << be_uidt_nl // idt = 4
-          << be_uidt_nl // idt = 3
-
+          << be_nl << be_uidt_nl; // idt = 4
+        }
+
+  *os << "case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:" << be_nl
+      << "default:"
+      << be_idt_nl // idt = 5
+      << "ACE_NEW_THROW_EX ("
+      << be_idt << be_idt_nl //idt = 7
+      << "this->proxy_cache_[strategy]," << be_nl
+      << "::" << node->full_remote_proxy_impl_name () << "," << be_nl
+      << "CORBA::NO_MEMORY ()"
+      << be_uidt << be_uidt_nl // idt = 5
+      << ");" << be_nl
+      << "ACE_CHECK;" << be_nl
+      << "break;"
+      << be_uidt_nl // idt = 4
+      << be_uidt_nl // idt = 3
       << "}"
       << be_uidt_nl // idt = 2
       << be_uidt_nl // idt = 1
       << "}"
       << be_uidt_nl // idt = 0
-
       << "}" << be_nl << be_nl;
 
   *os << be_nl