ChangeLogTag: Wed Apr 9 22:50:12 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 18 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f039a5f4bf3..2d18d7b57d2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Apr  9 22:50:12 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+
+          Fixed formatting in generated code for _unchecked_narrow().
+
+        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
+
+          Fixed logic in code generation of _unchecked_narrow(). Thanks
+          to Nanbor Wang <nanbor@cse.wustl.edu> for reporting the problem.
+
 Wed Apr  9 15:28:47 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/Stub.h (object_key):
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index dbc8af775ad..8573bdbcf6d 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -487,9 +487,8 @@ be_visitor_component_cs::gen_unchecked_narrow (be_component *node,
       << "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
+      << "::_nil ()" << be_uidt_nl << ");" << be_uidt_nl << be_nl
+      << "return default_proxy;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
   *os << "TAO_Stub* stub = obj->_stubobj ();" << be_nl << be_nl
@@ -498,9 +497,7 @@ be_visitor_component_cs::gen_unchecked_narrow (be_component *node,
       << "stub->_incr_refcnt ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
-
-
-  // If the policy didtates that the proxy be collocated, use the
+  // If the policy dictates that the proxy be collocated, use the
   // function to create one.
   *os << "if (" << be_idt << be_idt_nl
       << "!CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&" << be_nl
@@ -520,9 +517,8 @@ be_visitor_component_cs::gen_unchecked_narrow (be_component *node,
       << "obj->_servant ()" << be_uidt_nl << ")," << be_uidt_nl
       <<  bt->nested_type_name (this->ctx_->scope ())
       << "::_nil ()" << be_uidt_nl << ");"
-      << be_uidt << be_uidt_nl;
-
-
+      << be_uidt << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl;
 
   // The default proxy will either be returned else be transformed to
   // a smart one!
@@ -552,18 +548,4 @@ be_visitor_component_cs::gen_unchecked_narrow (be_component *node,
     }
 
   *os << "}" << be_nl << be_nl;
-
-  // Lazily evaluated IOR
-  *os << "return" << be_idt_nl
-      << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << node->local_name () << "_ptr," << be_nl
-      << "obj->_tao_QueryInterface (" << be_idt << be_idt_nl
-      << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << "ptr_arith_t," << be_nl
-      << "&" << node->local_name () << "::_tao_class_id" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt << be_uidt_nl;
-
-  *os << "}" << be_nl << be_nl;
 }
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 be7caf3c715..0437ece347e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -777,10 +777,6 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node,
       << "::_nil ();" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl;
 
-
-
-
-
   if (! node->is_local ())
     {
       // Declare the default proxy.
@@ -801,9 +797,8 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node,
           << "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
+          << "::_nil ()" << be_uidt_nl << ");" << be_uidt_nl << be_nl
+          << "return default_proxy;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl;
 
       // Remote _unchecked_narrow implementation.