diff options
Diffstat (limited to 'TAO/tao/Any.h')
| -rw-r--r-- | TAO/tao/Any.h | 99 |
1 files changed, 6 insertions, 93 deletions
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 4401d05fd27..2bc1ef2b49c 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -20,7 +20,6 @@ #include "tao/CDR.h" #include "tao/Environment.h" -#include "tao/Object.h" class TAO_Export CORBA_Any { @@ -75,12 +74,9 @@ public: // = TAO extension CORBA_Any (CORBA::TypeCode_ptr type, - CORBA::UShort dummy, const ACE_Message_Block* mb); - // Constructor. Used by DynAny and others to optimize Any - // activities by using CDR. The dummy arg is to keep calls - // like CORBA_Any foo (CORBA::TypeCode_ptr bar (NULL), NULL) from - // being confused with the constructor above. + // Constructor. Used by DynAny to compose/decompose + // complex types using a CDR. CORBA_Any (const CORBA_Any &a); // Copy constructor. @@ -121,10 +117,7 @@ public: // insert a double void operator<<= (const CORBA_Any&); - // insert an Any, copying - - void operator<<= (CORBA_Any_ptr); - // insert an Any, non-copying + // insert an Any void operator<<= (const char*); // insert unbounded strings @@ -136,7 +129,7 @@ public: // insert an object reference, copying. void operator<<= (CORBA::Object_ptr *); - // insert an object reference, non-copying. Any assumes the ownership + // insert an object reference, non-copying. Any assume the ownership // of the object. // =type safe extraction @@ -216,9 +209,7 @@ public: // This one's not in ACE. struct TAO_Export to_object { - // This signature reflects the change seet out in - // issue 154 of the 1.3 RTF. - to_object (CORBA_Object_out obj); + to_object (CORBA::Object_ptr &obj); CORBA::Object_ptr &ref_; }; @@ -295,6 +286,7 @@ public: void _tao_replace (CORBA::TypeCode_ptr, const ACE_Message_Block *mb, + CORBA::Boolean any_owns_data, CORBA::Environment &TAO_IN_ENV = CORBA::default_environment ()); // Replace via message block instead of <value_>. @@ -431,8 +423,6 @@ public: CORBA_Any *& ptr (void); // return underlying instance - CORBA_Any *operator-> (void); - private: CORBA_Any *&ptr_; // Instance @@ -443,83 +433,6 @@ private: #if defined (__ACE_INLINE__) # include "tao/Any.i" -#else - -// Copying versions of insertion -// operators which are defined as members of the Any class -// must also be defined for Any_var. -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Short); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::UShort); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Long); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::ULong); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::LongLong); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::ULongLong); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Float); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Double); -extern TAO_Export void operator<<= (CORBA_Any_var, - const CORBA_Any&); -extern TAO_Export void operator<<= (CORBA_Any_var, - const char*); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::TypeCode_ptr); -extern TAO_Export void operator<<= (CORBA_Any_var, - const CORBA::Object_ptr); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Any::from_boolean); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Any::from_char); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Any::from_wchar); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Any::from_octet); -extern TAO_Export void operator<<= (CORBA_Any_var, - CORBA::Any::from_string); - -// These are not required by the spec, but will make users -// of other ORBs that are used to them more comfortable. -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Short&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::UShort&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Long&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::ULong&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::LongLong&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::ULongLong&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Float&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Double&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA_Any&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::TypeCode_ptr&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - char*&); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Any::to_boolean); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Any::to_octet); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Any::to_char); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Any::to_wchar); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Any::to_string); -extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, - CORBA::Any::to_object); - #endif /* __ACE_INLINE__ */ #endif /* TAO_ANY_H */ |