*** empty log message ***

1 files changed, 29 insertions, 16 deletions

diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index 2b4e36a6afd..55c740cf42a 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -20,15 +20,14 @@ CORBA_Any::operator delete (void *p)
 
 // Insertion from special types.
 
-// @@ Andy, please take a look at this method and make sure it's what
-// you intended.  I couldn't find it defined anywhere.  --cjc
 ACE_INLINE void
 CORBA_Any::replace (CORBA::TypeCode_ptr type,
                     const void *value,
-                    CORBA::Boolean orb_owns_data)
+                    CORBA::Environment &env)
 {
-  CORBA_Environment e;
-  this->replace (type, value, orb_owns_data, e);
+  // invoke the first form of the replace method and pass the default value
+  // (FALSE) for the "any_owns_data" parameter
+  this->replace (type, value, CORBA::B_FALSE, env);
 }
 
 // insertion operators
@@ -36,51 +35,59 @@ CORBA_Any::replace (CORBA::TypeCode_ptr type,
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Short s)
 {
-  this->replace (CORBA::_tc_short, new CORBA::Short (s), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_short, new CORBA::Short (s), CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::UShort s)
 {
-  this->replace (CORBA::_tc_ushort, new CORBA::UShort (s), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_ushort, new CORBA::UShort (s), CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Long l)
 {
-  this->replace (CORBA::_tc_long, new CORBA::Long (l), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_long, new CORBA::Long (l), CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::ULong l)
 {
-  this->replace (CORBA::_tc_ulong, new CORBA::ULong (l), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_ulong, new CORBA::ULong (l), CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Float f)
 {
-  this->replace (CORBA::_tc_float, new CORBA::Float (f), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_float, new CORBA::Float (f), CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Double d)
 {
-  this->replace (CORBA::_tc_double, new CORBA::Double (d), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_double, new CORBA::Double (d), CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (const CORBA_Any& a)
 {
-  this->replace (CORBA::_tc_any, new CORBA_Any (a), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_any, new CORBA_Any (a), CORBA::B_TRUE, env);
 }
 
 // this is a copying version for unbounded strings
 ACE_INLINE void
 CORBA_Any::operator<<= (const char* s)
 {
+  CORBA::Environment env;
   this->replace (CORBA::_tc_string, new char* (CORBA::string_dup (s)),
-                 CORBA::B_TRUE);
+                 CORBA::B_TRUE, env);
 }
 
 // implementing the special types
@@ -147,19 +154,25 @@ CORBA_Any::to_object::to_object (CORBA::Object_ptr &obj)
 ACE_INLINE void
 CORBA_Any::operator<<= (from_boolean b)
 {
-  this->replace (CORBA::_tc_boolean, new CORBA::Boolean (b.val_), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_boolean, new CORBA::Boolean (b.val_),
+                 CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (from_octet o)
 {
-  this->replace (CORBA::_tc_octet, new CORBA::Octet (o.val_), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_octet, new CORBA::Octet (o.val_),
+                 CORBA::B_TRUE, env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (from_char c)
 {
-  this->replace (CORBA::_tc_char, new CORBA::Char (c.val_), CORBA::B_TRUE);
+  CORBA::Environment env;
+  this->replace (CORBA::_tc_char, new CORBA::Char (c.val_),
+                 CORBA::B_TRUE, env);
 }
 
 // ----------------------------------------------------------------------