.

1 files changed, 77 insertions, 21 deletions

diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index e90463f0307..ea859f47316 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -8,9 +8,12 @@ CORBA_Any::replace (CORBA::TypeCode_ptr type,
                     const void *value,
                     CORBA::Environment &TAO_IN_ENV)
 {
-  // invoke the first form of the replace method and pass the default value
-  // (FALSE) for the "any_owns_data" parameter
-  this->replace (type, value, 0, TAO_IN_ENV);
+  // Invoke the first form of the replace method and pass the default
+  // value (FALSE) for the "any_owns_data" parameter
+  this->replace (type,
+                 value,
+                 0,
+                 TAO_IN_ENV);
 }
 
 ACE_INLINE CORBA::Boolean
@@ -31,56 +34,88 @@ ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Short s)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_short, new CORBA::Short (s), 1, env);
+  this->replace (CORBA::_tc_short,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Short (s),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::UShort s)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_ushort, new CORBA::UShort (s), 1, env);
+  this->replace (CORBA::_tc_ushort,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::UShort (s),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Long l)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_long, new CORBA::Long (l), 1, env);
+  this->replace (CORBA::_tc_long,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Long (l),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::ULong l)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_ulong, new CORBA::ULong (l), 1, env);
+  this->replace (CORBA::_tc_ulong,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::ULong (l),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::LongLong l)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_longlong, new CORBA::LongLong (l), 1, env);
+  this->replace (CORBA::_tc_longlong,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::LongLong (l),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::ULongLong l)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_ulonglong, new CORBA::ULongLong (l), 1, env);
+  this->replace (CORBA::_tc_ulonglong,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::ULongLong (l),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Float f)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_float, new CORBA::Float (f), 1, env);
+  this->replace (CORBA::_tc_float,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Float (f),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (CORBA::Double d)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_double, new CORBA::Double (d), 1, env);
+  this->replace (CORBA::_tc_double,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Double (d),
+                 1,
+                 env);
 }
 
 // insertion of Any - copying
@@ -88,7 +123,11 @@ ACE_INLINE void
 CORBA_Any::operator<<= (const CORBA_Any& a)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_any, new CORBA_Any (a), 1, env);
+  this->replace (CORBA::_tc_any,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA_Any (a),
+                 1,
+                 env);
 }
 
 // insertion of Any - non-copying
@@ -96,7 +135,11 @@ ACE_INLINE void
 CORBA::Any::operator<<= (CORBA::Any_ptr anyptr)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_any, anyptr, 1, env);
+  this->replace (CORBA::_tc_any,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 anyptr,
+                 1,
+                 env);
 }
 
 // implementing the special types
@@ -110,32 +153,44 @@ ACE_INLINE void
 CORBA_Any::operator<<= (from_boolean b)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_boolean, new CORBA::Boolean (b.val_),
-                 1, env);
+  this->replace (CORBA::_tc_boolean,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Boolean (b.val_),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (from_octet o)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_octet, new CORBA::Octet (o.val_),
-                 1, env);
+  this->replace (CORBA::_tc_octet,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?                 
+                 new CORBA::Octet (o.val_),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (from_char c)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_char, new CORBA::Char (c.val_),
-                 1, env);
+  this->replace (CORBA::_tc_char,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::Char (c.val_),
+                 1,
+                 env);
 }
 
 ACE_INLINE void
 CORBA_Any::operator<<= (from_wchar wc)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_wchar, new CORBA::WChar (wc.val_),
-                 1, env);
+  this->replace (CORBA::_tc_wchar,
+                 // @@ Jeff, shouldn't we be checking if "new" fails?
+                 new CORBA::WChar (wc.val_),
+                 1,
+                 env);
 }
 
 // *************************************************************
@@ -156,6 +211,7 @@ CORBA_Any_var::CORBA_Any_var (CORBA_Any *p)
 
 ACE_INLINE
 CORBA_Any_var::CORBA_Any_var (const CORBA_Any_var& r)
+  // @@ Jeff, shouldn't we be checking if "new" fails?
   : ptr_ (new CORBA::Any (*r.ptr_))
 {
 }