Fri Nov 24 16:55:29 2000 Angelo Corsaro <corsaro@cs.wustl.edu>

24 files changed, 293 insertions, 164 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ccd20b32b14..fab87d001a5 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,44 @@
+Fri Nov 24 16:55:29 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+	* TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
+	* TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp:
+	* TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp:
+	* TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+	* TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:
+	* TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:
+
+	  Added generation of the default constructor to avoid problem
+	  with older compiler (like gcc272).
+
+	* TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:
+
+	  Made some cosmetic changes in the generated code.
+
+	* tao/Object_Proxy_Broker.cpp:
+	* tao/Object_Proxy_Broker.h:
+	* tao/Object_Proxy_Impl.cpp:
+	* tao/Object_Proxy_Impl.h:
+	* tao/Remote_Object_Proxy_Impl.cpp:
+	* tao/Remote_Object_Proxy_Impl.h:
+	* tao/PortableServer/Direct_Object_Proxy_Impl.cpp:
+	* tao/PortableServer/Direct_Object_Proxy_Impl.h:
+	* tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp:
+	* tao/PortableServer/ThruPOA_Object_Proxy_Impl.h:
+
+	  Added declaration and implementation of default constructor
+	  to fix the problem with some older compiler (like gcc272).
+
+	* tao/PortableServer/POA.cpp:
+
+	  Substituted  any use of TAO_Collocated_Object with
+	  CORBA::Object, in fact in the new collocation scheme
+	  TAO_Collocated_Object is not used anymore.
+
 Fri Nov 24 12:17:59 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* tests/Multiple/Multiple_Impl.cpp:
@@ -13,7 +54,7 @@ Fri Nov 24 14:07:13 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 	* orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
 	  Changed CosProperty_Hash_Key::pname_ to an _var type to fix a
 	  small memory leak. Thanks to Greg Hall greg.j.hall@boeing.com
-	  for providing the fix. 
+	  for providing the fix.
 
 Thu Nov 23 18:21:13 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
index 4e565e50a4c..1c5f7df653d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
@@ -27,35 +27,42 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (be_interface *node)
 
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////" << be_nl
-      << "//                 Base Proxy Broker Declaration " << be_nl 
+      << "//                 Base Proxy Broker Declaration " << be_nl
       << "//" << be_nl << be_nl;
-  
+
   // Generate the class declaration.
   os->indent ();
   *os << "class " << be_global->stub_export_macro () << " "
       << node->base_proxy_broker_name () << be_nl <<  "{" << be_nl
-      << "public:" 
+      << "public:"
       << be_idt_nl; // idt = 1
-    
+
+
+
   // Destructor
-  *os << "virtual ~" << node->base_proxy_broker_name () << " (void);\n" << be_nl;
+  *os << "virtual ~" << node->base_proxy_broker_name () << " (void);" << be_nl;
 
   // Accessor Method
-  *os << "virtual " << node->base_proxy_impl_name () << " &" 
-      << "select_proxy (" 
+  *os << "virtual " << node->base_proxy_impl_name () << " &"
+      << "select_proxy ("
       << be_idt_nl; // idt = 2
 
   *os << node->local_name () << " *object," << be_nl
       << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
-      << ") = 0;" 
+      << ") = 0;"
       << be_uidt_nl  // idt = 1
       << be_uidt_nl; // idt = 0
 
+  // Constructor
+  *os  << "protected:" << be_idt_nl
+       << node->base_proxy_broker_name () << " (void);" << be_nl
+       << be_uidt_nl;
+
   *os << "};" << be_nl << be_nl;
 
   *os << be_nl
       << "//" << be_nl
-      << "//              End Base Proxy Broker Declaration " << be_nl 
+      << "//              End Base Proxy Broker Declaration " << be_nl
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl << be_nl;
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
index 82f14c4a1f0..cf0901fecd6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
@@ -25,7 +25,7 @@ be_visitor_interface_base_proxy_impl_ch::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  os->indent ();
+  //  os->indent ();
 
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////" << be_nl
@@ -61,10 +61,15 @@ be_visitor_interface_base_proxy_impl_ch::visit_interface (be_interface *node)
   *os << "{" << be_nl << "public:"
       << be_idt_nl; // idt = 1
 
-   // Destructor Declaration.
+
+
+  // Destructor Declaration.
   *os << "virtual ~" << node->base_proxy_impl_name () << " (void);"
       << be_nl  << be_nl;
 
+
+
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -73,9 +78,15 @@ be_visitor_interface_base_proxy_impl_ch::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  *os << be_uidt // idt = 0
-      << "};" << be_nl;
-  *os << be_nl
+  *os << be_uidt; // idt = 0
+
+  // Constructor Declaration.
+  *os << "protected:" << be_idt_nl // idt = 1
+      << node->base_proxy_impl_name () << " (void);"
+      << be_uidt_nl  // idt = 0
+      << be_nl;
+
+  *os  << "};" << be_nl
       << "//" << be_nl
       << "//                Base  Proxy Impl. Declaration" << be_nl
       << "///////////////////////////////////////////////////////////////////////"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index 74d2cbd739e..ec4bf12ad3c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -58,8 +58,11 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (be_interface *node)
   *os << be_uidt_nl;
   *os << "{" << be_nl << "public:" << be_idt_nl;
 
+  // Ctor
+  *os << node->direct_proxy_impl_name () << " (void);" << be_nl << be_nl;
+
   // Dtor
-  *os << "~" << node->direct_proxy_impl_name () << " (void);" << be_nl << be_nl;
+  *os << "virtual ~" << node->direct_proxy_impl_name () << " (void);" << be_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index e167b395d52..12d7c1f2ee2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -19,19 +19,24 @@ be_visitor_interface_direct_proxy_impl_ss::~be_visitor_interface_direct_proxy_im
   // No-Op.
 }
 
-int 
+int
 be_visitor_interface_direct_proxy_impl_ss::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   this->ctx_->node (node);
   os->indent ();
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////" << be_nl
-      << "//                 Direct Proxy  Implementation" << be_nl 
+      << "//                 Direct Proxy  Implementation" << be_nl
       << "//" << be_nl << be_nl;
 
-  
+
+  // Ctor Implementation
+  *os << node->full_direct_proxy_impl_name () << "::"
+      << node->direct_proxy_impl_name () << " (void)"
+      << be_nl << "{}" << be_nl << be_nl;
+
   // Dtor Implementation
   *os << node->full_direct_proxy_impl_name () << "::"
       << "~" << node->direct_proxy_impl_name () << " (void)"
@@ -45,12 +50,11 @@ be_visitor_interface_direct_proxy_impl_ss::visit_interface (be_interface *node)
                          "codegen for scope failed\n"),
                         -1);
     }
-  
+
   *os << be_nl
       << "//" << be_nl
-      << "//           End Direct Proxy Implementation" << be_nl 
+      << "//           End Direct Proxy Implementation" << be_nl
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl;
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
index c85e2d414b8..ea74a83a16b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
@@ -36,8 +36,11 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (be_interface *node
       << node->base_proxy_broker_name () << be_nl <<  "{" << be_nl
       << "public: " << be_idt_nl;
 
+  // Constructor
+  *os << node->remote_proxy_broker_name () << " (void);" << be_nl << be_nl;
+
   // Destructor
-  *os << "virtual ~" << node->remote_proxy_broker_name () << " (void);\n" << be_nl;
+  *os << "virtual ~" << node->remote_proxy_broker_name () << " (void);" << be_nl << be_nl;
 
   // Accessor Method
   *os << "virtual " << node->base_proxy_impl_name () << " &" << "select_proxy (" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
index 204a0cf3531..0f0044e57c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
@@ -31,12 +31,17 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node
       << "//           Remote & Base  Proxy Broker Implementation" << be_nl
       << "//" << be_nl << be_nl;
 
+  *os << node->full_base_proxy_broker_name () << "::"
+      << node->base_proxy_broker_name () << " (void)" << be_nl
+      << "{" << be_nl
+      << "}" << be_nl << be_nl;
+
   *os << node->full_base_proxy_broker_name () << "::~"
       << node->base_proxy_broker_name () << " (void)" << be_nl
       << "{" << be_nl
       << "}" << be_nl << be_nl;
 
-  *os << "// Factory function Implementation." << be_nl
+  *os << "// Factory Member function Implementation." << be_nl
       << node->full_remote_proxy_broker_name ()
       << " *" << node->full_remote_proxy_broker_name () << "::the"
       << node->remote_proxy_broker_name ()
@@ -47,6 +52,13 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node
       << "return &remote_proxy_broker;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
+  // Ctor
+  *os << node->full_remote_proxy_broker_name () << "::"
+      << node->remote_proxy_broker_name () << " (void)" << be_nl
+      << "{" << be_nl
+      << "}" << be_nl << be_nl;
+
+  // Dtor
   *os << node->full_remote_proxy_broker_name () << "::~"
       << node->remote_proxy_broker_name () << " (void)" << be_nl
       << "{" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp
index 37d0d7dcf7d..a441414adb4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp
@@ -57,6 +57,10 @@ be_visitor_interface_remote_proxy_impl_ch::visit_interface (be_interface *node)
   *os << be_uidt_nl;
   *os << "{" << be_nl << "public:" << be_idt_nl;
 
+  // Constructor Declaration.
+  *os << node->remote_proxy_impl_name () << " (void);"
+      << be_nl  << be_nl;
+
   // Destructor Declaration.
   *os << "virtual ~" << node->remote_proxy_impl_name () << " (void);"
       << be_nl  << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp
index e549b66f3dd..f8318df0279 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_cs.cpp
@@ -23,21 +23,31 @@ be_visitor_interface_remote_proxy_impl_cs::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   os->decr_indent (0);
-  
+
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////" << be_nl
-      << "//                Base & Remote Proxy  Implementation. " << be_nl 
+      << "//                Base & Remote Proxy  Implementation. " << be_nl
       << "//" << be_nl << be_nl;
   // Create the destructor implementation for the base
   // proxy implementation.
-  os->indent ();
+  //os->indent ();
+
+  *os << node->full_base_proxy_impl_name () << "::"
+      << node->base_proxy_impl_name () << " (void)" << be_nl
+      << "{}" << be_nl << be_nl;
+
   *os << node->full_base_proxy_impl_name () << "::~"
       << node->base_proxy_impl_name () << " (void)" << be_nl
       << "{}" << be_nl << be_nl;
 
   // Create the destructor implementation for the remote
   // proxy implementation.
-  os->indent ();
+  //  os->indent ();
+
+  *os << node->full_remote_proxy_impl_name () << "::"
+      << node->remote_proxy_impl_name () << " (void)" << be_nl
+      << "{}" << be_nl << be_nl;
+
   *os << node->full_remote_proxy_impl_name () << "::~"
       << node->remote_proxy_impl_name () << " (void)" << be_nl
       << "{}" << be_nl << be_nl;
@@ -56,10 +66,10 @@ be_visitor_interface_remote_proxy_impl_cs::visit_interface (be_interface *node)
                          "codegen for Base Proxy Broker class failed\n"),
                         -1);
     }
-  
+
   *os << be_nl
       << "//" << be_nl
-      << "//            End  Base & Remote  Proxy Implemeentation. " << be_nl 
+      << "//            End  Base & Remote  Proxy Implemeentation. " << be_nl
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl << be_nl;
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index a922a6d7511..2f1f589b215 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -39,10 +39,10 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface
       << "public: " << be_idt_nl;
 
   // Constructor
-  *os << node->strategized_proxy_broker_name () << " (void);\n" << be_nl;
+  *os << node->strategized_proxy_broker_name () << " (void);" << be_nl << be_nl;
 
   // Destructor
-  *os << "virtual ~" << node->strategized_proxy_broker_name () << " (void);\n" << be_nl;
+  *os << "virtual ~" << node->strategized_proxy_broker_name () << " (void);" << be_nl << be_nl;
 
   // Accessor Method
   *os << "virtual " << "::" << node->full_base_proxy_impl_name () << " &" << "select_proxy (" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
index 7399a4300e5..c1a9b556875 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
@@ -57,8 +57,12 @@ be_visitor_interface_thru_poa_proxy_impl_sh::visit_interface (be_interface *node
   *os << be_uidt_nl;
     *os << "{" << be_nl << "public:" << be_idt_nl;
 
+    // Ctor
+    *os << node->thru_poa_proxy_impl_name () << " (void);" << be_nl << be_nl;
+
     // Dtor
-    *os << "~" << node->thru_poa_proxy_impl_name () << " (void);" << be_nl << be_nl;
+    *os << "virtual ~" << node->thru_poa_proxy_impl_name () << " (void);" << be_nl << be_nl;
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp
index 1dc30d86c10..d3e84e8405c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp
@@ -25,16 +25,17 @@ be_visitor_interface_thru_poa_proxy_impl_ss::visit_interface (be_interface *node
   os->indent ();
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////" << be_nl
-      << "//                 ThruPOA Proxy  Implementation" << be_nl 
+      << "//                 ThruPOA Proxy  Implementation" << be_nl
       << "//" << be_nl << be_nl;
 
-  // Create the destructor implementation for the base
-  // proxy implementation.
-  os->indent ();
-  
+  *os << node->full_thru_poa_proxy_impl_name () << "::"
+      << node->thru_poa_proxy_impl_name () << " (void)" << be_nl
+      << "{}" << be_nl << be_nl;
+
   // Create the destructor implementation for the remote
   // proxy implementation.
-  os->indent ();
+
+  //os->indent ();
   *os << node->full_thru_poa_proxy_impl_name () << "::~"
       << node->thru_poa_proxy_impl_name () << " (void)" << be_nl
       << "{}" << be_nl << be_nl;
@@ -54,14 +55,13 @@ be_visitor_interface_thru_poa_proxy_impl_ss::visit_interface (be_interface *node
                         -1);
     }
   *os << be_uidt << be_uidt;
-  
+
   *os << be_nl
       << "//" << be_nl
-      << "//           End ThruPOA Proxy Implementation" << be_nl 
+      << "//           End ThruPOA Proxy Implementation" << be_nl
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl << be_nl;
 
   return 0;
 
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index 8d39dacf676..2dc26003e52 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -110,7 +110,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (be_operation *node
     }
   delete visitor;
 
-  *os << "{" << be_idt << "\n";
+  *os << "{" << be_idt << be_nl;
 
   if (!be_global->exception_support ())
     {
@@ -144,11 +144,11 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (be_operation *node
                                  "codegen failed\n"),
                                 -1);
             }
-          *os << ");\n";
+          *os << ");" << be_nl;
         }
     }
 
-  os->indent ();
+  //  os->indent ();
 
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
@@ -163,9 +163,9 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (be_operation *node
   if (!be_global->exception_support ())
     *os << "," << be_nl
         << "ACE_TRY_ENV" << be_uidt_nl
-        << ");\n" << be_uidt;
+        << ");" << be_nl << be_uidt;
   else
-    *os << be_uidt_nl << ");\n" << be_uidt;
+    *os << be_uidt_nl << ");" << be_uidt_nl;
 
   // check if there is an exception
   if (!be_global->exception_support ())
@@ -234,7 +234,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::gen_invoke (
 
   // End the upcall
   *os << be_uidt_nl
-      << ");\n";
+      << ");" << be_nl;
 
   return 0;
 }
@@ -252,16 +252,16 @@ be_visitor_operation_thru_poa_proxy_impl_ss::gen_check_exception (be_type *bt)
       if (bt->size_type () == be_decl::VARIABLE
           || bt->base_node_type () == AST_Decl::NT_array)
         {
-          *os << "ACE_CHECK_RETURN (0);\n";
+          *os << "ACE_CHECK_RETURN (0);" << be_nl;
         }
       else
         {
-          *os << "ACE_CHECK_RETURN  (_tao_retval);\n";
+          *os << "ACE_CHECK_RETURN  (_tao_retval);" << be_nl;
         }
     }
   else
     {
-      *os << "ACE_CHECK;\n";
+      *os << "ACE_CHECK;" << be_nl;
     }
 
   return 0;
diff --git a/TAO/tao/Object_Proxy_Broker.cpp b/TAO/tao/Object_Proxy_Broker.cpp
index 46cdda52e91..81bd4d5544a 100644
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ b/TAO/tao/Object_Proxy_Broker.cpp
@@ -4,8 +4,13 @@
 
 ACE_RCSID (tao, TAO_Object_Proxy_Broker, "$Id$")
 
-TAO_Object_Proxy_Broker::~TAO_Object_Proxy_Broker (void)
+TAO_Object_Proxy_Broker::TAO_Object_Proxy_Broker (void)
 {
   // No-Op.
 }
 
+
+TAO_Object_Proxy_Broker::~TAO_Object_Proxy_Broker (void)
+{
+  // No-Op.
+}
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index 87219445ed2..420179ef4a6 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -10,7 +10,7 @@
 //
 // = DESCRIPTION
 //    This files contains the abstract class for the CORBA Object
-//    proxy brokers. Interface specific proxy broker are generated 
+//    proxy brokers. Interface specific proxy broker are generated
 //    by the IDL compiler.
 //
 // = AUTHOR
@@ -40,6 +40,8 @@ public:
   virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object,
                                                CORBA::Environment &ACE_TRY_ENV) = 0;
 
+protected:
+  TAO_Object_Proxy_Broker (void);
 };
 
 
@@ -47,13 +49,3 @@ public:
 #include "ace/post.h"
 
 #endif // TAO_OBJECT_PROXY_BROKER_H_
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/tao/Object_Proxy_Impl.cpp b/TAO/tao/Object_Proxy_Impl.cpp
index cc9984a52d0..58a270b075c 100644
--- a/TAO/tao/Object_Proxy_Impl.cpp
+++ b/TAO/tao/Object_Proxy_Impl.cpp
@@ -4,7 +4,13 @@
 
 ACE_RCSID(tao, Object_Proxy_Impl, "$Id$")
 
+TAO_Object_Proxy_Impl::TAO_Object_Proxy_Impl (void)
+{
+  // No-Op.
+}
+
+
 TAO_Object_Proxy_Impl::~TAO_Object_Proxy_Impl (void)
 {
-  // No-Op
+  // No-Op.
 }
diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h
index 1311c67c55f..619edaceb1d 100644
--- a/TAO/tao/Object_Proxy_Impl.h
+++ b/TAO/tao/Object_Proxy_Impl.h
@@ -35,6 +35,7 @@ public:
 
   virtual ~TAO_Object_Proxy_Impl (void);
 
+
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
                                 const CORBA::Char *logical_type_id,
                                 CORBA_Environment &ACE_TRY_ENV) = 0;
@@ -46,6 +47,9 @@ public:
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
+protected:
+  TAO_Object_Proxy_Impl (void);
+
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
index 90c2d3871d0..9d2b5210ec1 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
@@ -6,6 +6,12 @@
 
 ACE_RCSID(tao, TAO_Direct_Object_Proxy_Impl, "$Id$")
 
+TAO_Direct_Object_Proxy_Impl::TAO_Direct_Object_Proxy_Impl (void)
+{
+  // No-op
+}
+
+
 TAO_Direct_Object_Proxy_Impl::~TAO_Direct_Object_Proxy_Impl (void)
 {
   // No-op
@@ -16,7 +22,7 @@ TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
                                      const CORBA::Char *logical_type_id,
                                      CORBA_Environment &ACE_TRY_ENV )
 {
-  
+
   return target->_servant ()->_is_a (logical_type_id,
                                      ACE_TRY_ENV);
 }
@@ -33,7 +39,7 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
     {
       if (target->_servant () != 0)
         return target->_servant ()->_non_existent (ACE_TRY_ENV);
-          
+
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
     }
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
index f5fd489ea57..5ea93784c09 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
@@ -44,6 +44,8 @@ class TAO_PortableServer_Export TAO_Direct_Object_Proxy_Impl : public virtual TA
   //     class.
 public:
 
+  TAO_Direct_Object_Proxy_Impl (void);
+
   virtual ~TAO_Direct_Object_Proxy_Impl (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index c64cc676f2a..6ef8026c767 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -1,7 +1,6 @@
 // @(#) $Id$
 
 #include "POA.h"
-#include "Collocated_Object.h"
 
 //
 // ImplRepo related.
@@ -2137,7 +2136,7 @@ TAO_POA::valid_priority (RTCORBA::Priority priority)
   if (bands_policy != 0)
     // Case 1.
     {
-      RTCORBA::PriorityBands &bands = 
+      RTCORBA::PriorityBands &bands =
         bands_policy->priority_bands_rep ();
 
       for (CORBA::ULong i = 0; i < bands.length (); ++i)
@@ -3623,14 +3622,14 @@ TAO_POA_Policies::validate_priorities (CORBA::Environment &ACE_TRY_ENV)
   //     service it, i.e., whose priority falls into the band's range.
   if (this->priority_bands_ != 0)
     {
-      RTCORBA::PriorityBands &bands = 
+      RTCORBA::PriorityBands &bands =
         this->priority_bands_->priority_bands_rep ();
-      
+
       // Checks 0 and 1.
       if (bands.length () == 0
           || this->server_priority_ == TAO_INVALID_PRIORITY)
         ACE_THROW (PortableServer::POA::InvalidPolicy ());
-        
+
       // Check 2.
       if (this->priority_model_ == SERVER_DECLARED)
         {
@@ -3644,7 +3643,7 @@ TAO_POA_Policies::validate_priorities (CORBA::Environment &ACE_TRY_ENV)
                   break;
                 }
             }
-          
+
           if (!match)
             ACE_THROW (PortableServer::POA::InvalidPolicy ());
         }
@@ -3654,8 +3653,8 @@ TAO_POA_Policies::validate_priorities (CORBA::Environment &ACE_TRY_ENV)
       for (CORBA::ULong i = 0; i < bands.length (); ++i)
         {
           int match = 0;
-          for (TAO_AcceptorSetIterator a = ar->begin (); 
-               a != ar->end (); 
+          for (TAO_AcceptorSetIterator a = ar->begin ();
+               a != ar->end ();
                ++a)
             {
               if ((*a)->priority () <= bands[i].high
@@ -3686,7 +3685,7 @@ TAO_POA_Policies::validate_priorities (CORBA::Environment &ACE_TRY_ENV)
           if ((*a)->priority () == this->server_priority_)
             return;
         }
-      
+
       ACE_THROW (CORBA::BAD_PARAM ());
     }
 }
@@ -4068,11 +4067,11 @@ orbkey:
 
   if (this->orb_core_.optimize_collocation_objects ())
     {
-      ACE_NEW_THROW_EX (tmp,
-                        TAO_Collocated_Object (safe_data.get (),
-                                               collocated,
-                                               servant),
+      ACE_NEW_THROW_EX (tmp, CORBA::Object (safe_data.get (),
+                                            collocated,
+                                            servant),
                         CORBA::INTERNAL ());
+
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   else
@@ -4137,7 +4136,7 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
           TAO_Priority_Acceptor_Filter
             filter (this->policies ().server_protocol ()->protocols_rep (),
                     priority);
-          
+
           data = this->orb_core_.create_stub_object (key,
                                                      type_id,
                                                      client_exposed_policies._retn (),
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
index addb42dbd74..ff47aa4c1c3 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
@@ -9,7 +9,13 @@
 
 ACE_RCSID(tao, TAO_ThruPOA_Object_Proxy_Impl, "$Id$")
 
-  TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void)
+TAO_ThruPOA_Object_Proxy_Impl::TAO_ThruPOA_Object_Proxy_Impl (void)
+{
+  // No-op
+}
+
+
+TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void)
 {
   // No-op
 }
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
index 3de190f5eaa..66cd2413034 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
@@ -43,6 +43,8 @@ class TAO_PortableServer_Export TAO_ThruPOA_Object_Proxy_Impl : public virtual T
   //    This class implements the ThruPOA proxy for the CORBA::Object class.
 public:
 
+  TAO_ThruPOA_Object_Proxy_Impl (void);
+
   virtual ~TAO_ThruPOA_Object_Proxy_Impl (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp
index c6848584450..526bd7f5299 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp
@@ -8,81 +8,87 @@
 
 ACE_RCSID(tao, TAO_Remote_Object_Proxy_Impl, "$Id$")
 
-TAO_Remote_Object_Proxy_Impl::~TAO_Remote_Object_Proxy_Impl(void)
+TAO_Remote_Object_Proxy_Impl::TAO_Remote_Object_Proxy_Impl (void)
+{
+  // No-Op
+}
+
+
+TAO_Remote_Object_Proxy_Impl::~TAO_Remote_Object_Proxy_Impl (void)
 {
   // No-Op
 }
 
 CORBA::Boolean
 TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
-				     const CORBA::Char *logical_type_id,
-				     CORBA_Environment &ACE_TRY_ENV)
+                                     const CORBA::Char *logical_type_id,
+                                     CORBA_Environment &ACE_TRY_ENV)
 {
   if (target->_stubobj ()->type_id.in () != 0
-      && ACE_OS::strcmp	(logical_type_id,
-			 target->_stubobj ()->type_id.in ()) ==	0)
+      && ACE_OS::strcmp (logical_type_id,
+                         target->_stubobj ()->type_id.in ()) == 0)
     return 1;
 
-  // Here we go	remote to answer the question.
+  // Here we go remote to answer the question.
   CORBA::Boolean _tao_retval = 0;
 
   TAO_Stub *istub = target->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (
-			CORBA_SystemException::_tao_minor_code (
-			  TAO_DEFAULT_MINOR_CODE,
-			  EINVAL),
-			CORBA::COMPLETED_NO),
-		      _tao_retval);
+                        CORBA_SystemException::_tao_minor_code (
+                          TAO_DEFAULT_MINOR_CODE,
+                          EINVAL),
+                        CORBA::COMPLETED_NO),
+                      _tao_retval);
 
   TAO_GIOP_Twoway_Invocation _tao_call (istub,
-					"_is_a",
-					5,
-					1,
-					istub->orb_core	());
-
-  // Loop until	we succeed or we raise an exception.
-  // @@	Nanbor:	Do we still need to clear the environment variable?
-  //  ACE_TRY_ENV.clear	();
+                                        "_is_a",
+                                        5,
+                                        1,
+                                        istub->orb_core ());
+
+  // Loop until we succeed or we raise an exception.
+  // @@ Nanbor: Do we still need to clear the environment variable?
+  //  ACE_TRY_ENV.clear ();
   for (;;)
     {
       _tao_call.start (ACE_TRY_ENV);
       ACE_CHECK_RETURN (_tao_retval);
 
-      CORBA::Short flag	= TAO_TWOWAY_RESPONSE_FLAG;
+      CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
-      _tao_call.prepare_header (ACE_static_cast	(CORBA::Octet, flag),
-				ACE_TRY_ENV);
+      _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
+                                ACE_TRY_ENV);
       ACE_CHECK_RETURN (_tao_retval);
 
-      TAO_OutputCDR &_tao_out =	_tao_call.out_stream ();
+      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
       if (!(
-	    (_tao_out << logical_type_id)
-	    ))
-	ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+            (_tao_out << logical_type_id)
+            ))
+        ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
 
       int _invoke_status =
-	_tao_call.invoke (0, 0,	ACE_TRY_ENV);
+        _tao_call.invoke (0, 0, ACE_TRY_ENV);
       ACE_CHECK_RETURN (_tao_retval);
 
       if (_invoke_status == TAO_INVOKE_RESTART)
-	continue;
+        continue;
       // if (_invoke_status == TAO_INVOKE_EXCEPTION)
-      // cannot	happen
+      // cannot happen
       if (_invoke_status != TAO_INVOKE_OK)
-	{
-	  ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
-					    CORBA::COMPLETED_YES),
-			    _tao_retval);
+        {
+          ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
+                                            CORBA::COMPLETED_YES),
+                            _tao_retval);
 
-	}
+        }
       break;
     }
-  TAO_InputCDR &_tao_in	= _tao_call.inp_stream ();
-  if (!(_tao_in	>> CORBA::Any::to_boolean (_tao_retval)))
+  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+  if (!(_tao_in >> CORBA::Any::to_boolean (_tao_retval)))
     ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-				      CORBA::COMPLETED_YES),
-		      _tao_retval);
+                                      CORBA::COMPLETED_YES),
+                      _tao_retval);
   return _tao_retval;
 
 }
@@ -90,62 +96,62 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 CORBA::Boolean TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
-							    CORBA_Environment &ACE_TRY_ENV)
+                                                            CORBA_Environment &ACE_TRY_ENV)
 {
   CORBA::Boolean _tao_retval = 0;
 
   ACE_TRY
     {
-      // Must catch exceptions,	if the server raises a
-      // CORBA::OBJECT_NOT_EXIST then we must return 1,	instead	of
+      // Must catch exceptions, if the server raises a
+      // CORBA::OBJECT_NOT_EXIST then we must return 1, instead of
       // propagating the exception.
-      TAO_Stub *istub =	target->_stubobj ();
-      if (istub	== 0)
-	ACE_THROW_RETURN (CORBA::INTERNAL (
-			    CORBA_SystemException::_tao_minor_code (
-			      TAO_DEFAULT_MINOR_CODE,
-			      EINVAL),
-			    CORBA::COMPLETED_NO),
-			  _tao_retval);
+      TAO_Stub *istub = target->_stubobj ();
+      if (istub == 0)
+        ACE_THROW_RETURN (CORBA::INTERNAL (
+                            CORBA_SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              EINVAL),
+                            CORBA::COMPLETED_NO),
+                          _tao_retval);
 
       TAO_GIOP_Twoway_Invocation _tao_call (istub,
-					    "_non_existent",
-					    13,
-					    1,
-					    istub->orb_core ());
+                                            "_non_existent",
+                                            13,
+                                            1,
+                                            istub->orb_core ());
 
       // ACE_TRY_ENV.clear ();
       for (;;)
-	{
-	  _tao_call.start (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-
-	  CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
-	  _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-				    ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-
-	  int _invoke_status =
-	    _tao_call.invoke (0, 0, ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-
-	  if (_invoke_status ==	TAO_INVOKE_RESTART)
-	    continue;
-	  ACE_ASSERT (_invoke_status !=	TAO_INVOKE_EXCEPTION);
-	  if (_invoke_status !=	TAO_INVOKE_OK)
-	    {
-	      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
-						CORBA::COMPLETED_YES),
-				_tao_retval);
-	    }
-	  break;
-	}
+        {
+          _tao_call.start (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+          _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
+                                    ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          int _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (_invoke_status == TAO_INVOKE_RESTART)
+            continue;
+          ACE_ASSERT (_invoke_status != TAO_INVOKE_EXCEPTION);
+          if (_invoke_status != TAO_INVOKE_OK)
+            {
+              ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
+                                                CORBA::COMPLETED_YES),
+                                _tao_retval);
+            }
+          break;
+        }
       TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
       if (!(
-	    (_tao_in >>	CORBA::Any::to_boolean (_tao_retval))
-	    ))
-	ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
+            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+            ))
+        ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
@@ -159,4 +165,4 @@ CORBA::Boolean TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_
   return _tao_retval;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA	== 0 */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/Remote_Object_Proxy_Impl.h b/TAO/tao/Remote_Object_Proxy_Impl.h
index 34636fad7ac..dc40e6c0424 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.h
+++ b/TAO/tao/Remote_Object_Proxy_Impl.h
@@ -35,6 +35,8 @@ class TAO_Export TAO_Remote_Object_Proxy_Impl : public virtual TAO_Object_Proxy_
   //
 public:
 
+  TAO_Remote_Object_Proxy_Impl (void);
+
   virtual ~TAO_Remote_Object_Proxy_Impl (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,