*** empty log message ***

4 files changed, 6 insertions, 22 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index 7dd13fd0577..edf9ef073be 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -54,11 +54,8 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
   os->indent ();
   *os << "// Any operators for interface " << node->name () << be_nl;
   *os << "void " << idl_global->export_macro ()
-      << " operator<<= (CORBA::Any &, " << node->name ()
-      << " _ptr); // copying version" << be_nl;
-  *os << "void " << idl_global->export_macro ()
-      << " operator<<= (CORBA::Any &, " << node->name ()
-      << "_ptr*); // noncopying version" << be_nl;
+      << " operator<<= (CORBA::Any &, " << node->name () 
+      << "_ptr);" << be_nl;
   *os << "CORBA::Boolean " << idl_global->export_macro ()
       << " operator>>= (const CORBA::Any &, "
       << node->name () << " *&);\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index 72c66b66368..c06122bb3fd 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -55,7 +55,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
   // Any <<= and >>= operators
   os->indent ();
   *os << "void operator<<= (CORBA::Any &_tao_any, "
-      << node->name () << "_ptr _tao_elem) // copying" << be_nl
+      << node->name () << "_ptr _tao_elem)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::Environment _tao_env;" << be_nl
       << "CORBA::Object_ptr *_tao_obj_ptr;" << be_nl
@@ -66,14 +66,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << "_tao_obj_ptr, 1, _tao_env);" << be_uidt_nl
       << "}\n" << be_nl;
 
-  *os << "void operator<<= (CORBA::Any &_tao_any, "
-      << node->name () << "_ptr *_tao_elem) // non copying" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::Environment _tao_env;" << be_nl
-      << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_elem, 1, _tao_env); // consume it" << be_uidt_nl
-      << "}\n" << be_nl;
-
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << "_ptr &_tao_elem)" << be_nl
       << "{" << be_idt_nl
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 43c872cbe63..228dacccfc6 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -72,7 +72,7 @@ const char* CORBA_Current::_interface_repository_id (void) const
   return "IDL:CORBA/Current:1.0";
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr _tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr _tao_elem)
 {
   CORBA::Environment _tao_env;
   CORBA::Object_ptr *_tao_obj_ptr;
@@ -80,11 +80,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr _tao_elem) // copying
   *_tao_obj_ptr = CORBA_Current::_duplicate (_tao_elem);
   _tao_any.replace (CORBA::_tc_Current, _tao_obj_ptr, 1, _tao_env);
 }
-void operator<<= (CORBA::Any &_tao_any, CORBA_Current_ptr *_tao_elem) // non copying
-{
-  CORBA::Environment _tao_env;
-  _tao_any.replace (CORBA::_tc_Current, _tao_elem, 0, _tao_env);
-}
+
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Current_ptr &_tao_elem)
 {
   CORBA::Environment _tao_env;
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index ef4879d620f..3d354d0ccc9 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -130,8 +130,7 @@ class  CORBA_Current : public virtual ACE_CORBA_1 (Object)
 #endif /* end #if !defined */
 
 // Any operators for interface CORBA_Current
-void operator<<= (CORBA::Any &, const CORBA_Current &); // copying version
-void operator<<= (CORBA::Any &, CORBA_Current*); // noncopying version
+void operator<<= (CORBA::Any &, CORBA_Current_ptr);
 CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Current *&);
 
 #if defined (__ACE_INLINE__)