ChangeLogTag: Sat Feb 22 09:50:31 2003 Ossama Othman <ossama@uci.edu>

3 files changed, 44 insertions, 37 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index 6ac4e773866..6e2bd0d2326 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -347,15 +347,16 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << node->local_name () << " &);" << be_nl;
     }
 
-  *os << node->local_name ()
-      << " (IOP::IOR *ior," << be_idt_nl
-      << be_idt << "TAO_ORB_Core *orb_core = 0);" << be_uidt_nl
-      << be_uidt_nl;
 
   // Local interfaces don't support stub objects.
   if (! node->is_local ())
     {
       *os << node->local_name ()
+          << " (IOP::IOR *ior," << be_idt_nl
+          << be_idt << "TAO_ORB_Core *orb_core = 0);" << be_uidt_nl
+          << be_uidt_nl;
+
+      *os << node->local_name ()
           << " (" << be_idt << be_idt_nl << "TAO_Stub *objref, " << be_nl
           << "CORBA::Boolean _tao_collocated = 0," << be_nl
           << "TAO_Abstract_ServantBase *servant = 0," <<  be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 4628c3c2efb..392d5b70652 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -101,19 +101,22 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
       node->gen_stub_ctor (os);
     }
 
-  *os << be_nl << be_nl
-      << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::"
-      << node->local_name () << " ("
-      << be_idt << be_idt_nl
-      << "IOP::IOR *ior," << be_nl
-      << "TAO_ORB_Core *oc" << be_uidt_nl
-      << ")"
-      << be_nl;
-  *os << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)";
-
-  *os << be_nl << "{" << be_idt_nl
-      << "}" ;
+  if (!node->is_local ())
+    {
+      *os << be_nl << be_nl
+          << "ACE_INLINE" << be_nl;
+      *os << node->name () << "::"
+          << node->local_name () << " ("
+          << be_idt << be_idt_nl
+          << "IOP::IOR *ior," << be_nl
+          << "TAO_ORB_Core *oc" << be_uidt_nl
+          << ")"
+          << be_nl;
+      *os << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)";
+
+      *os << be_nl << "{" << be_idt_nl
+          << "}" ;
+    }
 
   os->gen_endif ();
   node->cli_inline_gen (I_TRUE);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 6cac3b27f78..103bd55e8d6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -749,32 +749,35 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node,
       << "::_nil ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
-  // Declare the default proxy.
-  *os << bt->nested_type_name (this->ctx_->scope ())
-      << "_ptr default_proxy = "
-      << bt->nested_type_name (this->ctx_->scope ())
-      <<"::_nil ();" << be_nl << be_nl;
 
 
-  // Code for lzay evaluation..
-  *os << "// Code for lazily evaluated IOR's" << be_nl;
 
-  *os << "if (!obj->is_evaluated ())" << be_idt_nl
-      << "{" << be_idt_nl
-      << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-      << "default_proxy," << be_nl
-      << "::" <<  bt->name ()
-      << " (" << be_idt << be_idt_nl
-      << "obj->steal_ior ()," << be_nl
-      << "obj->orb_core ()" << be_uidt_nl << ")," << be_uidt_nl
-      << bt->nested_type_name (this->ctx_->scope ())
-      << "::_nil ()" << be_uidt_nl << ");"
-      << "return default_proxy;" << be_nl
-      << be_uidt << be_uidt_nl
-      << "}" << be_uidt_nl << be_nl;
 
   if (! node->is_local ())
     {
+      // Declare the default proxy.
+      *os << bt->nested_type_name (this->ctx_->scope ())
+          << "_ptr default_proxy = "
+          << bt->nested_type_name (this->ctx_->scope ())
+          <<"::_nil ();" << be_nl << be_nl;
+
+      // Code for lzay evaluation..
+      *os << "// Code for lazily evaluated IOR's" << be_nl;
+
+      *os << "if (!obj->is_evaluated ())" << be_idt_nl
+          << "{" << be_idt_nl
+          << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
+          << "default_proxy," << be_nl
+          << "::" <<  bt->name ()
+          << " (" << be_idt << be_idt_nl
+          << "obj->steal_ior ()," << be_nl
+          << "obj->orb_core ()" << be_uidt_nl << ")," << be_uidt_nl
+          << bt->nested_type_name (this->ctx_->scope ())
+          << "::_nil ()" << be_uidt_nl << ");" << be_nl
+          << "return default_proxy;" << be_nl
+          << be_uidt << be_uidt_nl
+          << "}" << be_uidt_nl << be_nl;
+
       // Remote _unchecked_narrow implementation.
       *os << "if (! obj->_is_local ())" << be_idt_nl
           << "{" << be_idt_nl