diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-05 18:52:03 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-05 18:52:03 +0000 |
| commit | 6104c484ac1c591948ed5b16b07b69abad5fdd75 (patch) | |
| tree | f86e69acb285d0a45ecb500925aea2f47a3bb36d | |
| parent | 0dc17915b2413644a3c0d502e4b4b8fa42bc2d13 (diff) | |
| download | ATCD-6104c484ac1c591948ed5b16b07b69abad5fdd75.tar.gz | |
added ACE_LACKS_LONGLONG_T support
| -rw-r--r-- | TAO/tao/DynAnyC.cpp | 661 | ||||
| -rw-r--r-- | TAO/tao/DynArray_i.cpp | 120 | ||||
| -rw-r--r-- | TAO/tao/DynEnum_i.cpp | 74 | ||||
| -rw-r--r-- | TAO/tao/DynSequence_i.cpp | 146 | ||||
| -rw-r--r-- | TAO/tao/DynStruct_i.cpp | 272 | ||||
| -rw-r--r-- | TAO/tao/DynUnion_i.cpp | 576 | ||||
| -rw-r--r-- | TAO/tao/DynUnion_i_T.cpp | 12 |
7 files changed, 950 insertions, 911 deletions
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp index 2ef5f2555b4..10ed50a8119 100644 --- a/TAO/tao/DynAnyC.cpp +++ b/TAO/tao/DynAnyC.cpp @@ -32,7 +32,7 @@ CORBA_DynAny_ptr CORBA_DynAny::_duplicate (CORBA_DynAny_ptr obj) { if (!CORBA::is_nil (obj)) obj->_incr_refcnt (); - + return obj; } // end of _duplicate @@ -99,12 +99,12 @@ CORBA_DynAny::Invalid::operator= (const CORBA_DynAny::Invalid &_tao_excp) } // narrow -CORBA_DynAny::Invalid_ptr +CORBA_DynAny::Invalid_ptr CORBA_DynAny::Invalid::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/Invalid:1.0", + if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/Invalid:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_DynAny::Invalid_ptr, + return ACE_dynamic_cast (CORBA_DynAny::Invalid_ptr, exc); else return 0; @@ -125,27 +125,27 @@ CORBA::Exception *CORBA_DynAny::Invalid::_alloc (void) static const CORBA::Long _oc_CORBA_DynAny_Invalid[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 24, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x416e792f), - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c69643a), - ACE_NTOHL (0x312e3000), // repository ID = + 24, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x416e792f), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c69643a), + ACE_NTOHL (0x312e3000), // repository ID = // IDL:/CORBA_DynAny/Invalid:1.0 - 8, - ACE_NTOHL (0x496e7661), + 8, + ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696400), // name = Invalid 0, // member count }; static CORBA::TypeCode _tc__tc_CORBA_DynAny_Invalid ( - CORBA::tk_except, - sizeof (_oc_CORBA_DynAny_Invalid), - (char *) &_oc_CORBA_DynAny_Invalid, + CORBA::tk_except, + sizeof (_oc_CORBA_DynAny_Invalid), + (char *) &_oc_CORBA_DynAny_Invalid, 0 ); -CORBA::TypeCode_ptr CORBA_DynAny::_tc_Invalid = +CORBA::TypeCode_ptr CORBA_DynAny::_tc_Invalid = &_tc__tc_CORBA_DynAny_Invalid; // default constructor @@ -178,12 +178,12 @@ CORBA_DynAny::InvalidValue::operator= ( } // narrow -CORBA_DynAny::InvalidValue_ptr +CORBA_DynAny::InvalidValue_ptr CORBA_DynAny::InvalidValue::_narrow (CORBA::Exception *exc) { if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidValue:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_DynAny::InvalidValue_ptr, + return ACE_dynamic_cast (CORBA_DynAny::InvalidValue_ptr, exc); else return 0; @@ -204,31 +204,31 @@ CORBA::Exception *CORBA_DynAny::InvalidValue::_alloc (void) static const CORBA::Long _oc_CORBA_DynAny_InvalidValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x416e792f), - ACE_NTOHL (0x496e7661), + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x416e792f), + ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696456), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0xfdfdfd), // repository ID = + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0xfdfdfd), // repository ID = // IDL:/CORBA_DynAny/InvalidValue:1.0 - 13, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696456), - ACE_NTOHL (0x616c7565), + 13, + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696456), + ACE_NTOHL (0x616c7565), ACE_NTOHL (0xfdfdfd), // name = InvalidValue 0, // member count }; static CORBA::TypeCode _tc__tc_CORBA_DynAny_InvalidValue ( - CORBA::tk_except, - sizeof (_oc_CORBA_DynAny_InvalidValue), - (char *) &_oc_CORBA_DynAny_InvalidValue, + CORBA::tk_except, + sizeof (_oc_CORBA_DynAny_InvalidValue), + (char *) &_oc_CORBA_DynAny_InvalidValue, 0 ); -CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidValue = +CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidValue = &_tc__tc_CORBA_DynAny_InvalidValue; // default constructor @@ -261,12 +261,12 @@ CORBA_DynAny::TypeMismatch::operator= ( } // narrow -CORBA_DynAny::TypeMismatch_ptr +CORBA_DynAny::TypeMismatch_ptr CORBA_DynAny::TypeMismatch::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/TypeMismatch:1.0", + if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/TypeMismatch:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_DynAny::TypeMismatch_ptr, + return ACE_dynamic_cast (CORBA_DynAny::TypeMismatch_ptr, exc); else return 0; @@ -287,30 +287,30 @@ CORBA::Exception *CORBA_DynAny::TypeMismatch::_alloc (void) static const CORBA::Long _oc_CORBA_DynAny_TypeMismatch[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x416e792f), - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x4d69736d), - ACE_NTOHL (0x61746368), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0xfdfdfd), // repository ID = + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x416e792f), + ACE_NTOHL (0x54797065), + ACE_NTOHL (0x4d69736d), + ACE_NTOHL (0x61746368), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0xfdfdfd), // repository ID = // IDL:/CORBA_DynAny/TypeMismatch:1.0 - 13, ACE_NTOHL (0x54797065), - ACE_NTOHL (0x4d69736d), - ACE_NTOHL (0x61746368), + 13, ACE_NTOHL (0x54797065), + ACE_NTOHL (0x4d69736d), + ACE_NTOHL (0x61746368), ACE_NTOHL (0xfdfdfd), // name = TypeMismatch 0, // member count }; static CORBA::TypeCode _tc__tc_CORBA_DynAny_TypeMismatch ( - CORBA::tk_except, - sizeof (_oc_CORBA_DynAny_TypeMismatch), - (char *) &_oc_CORBA_DynAny_TypeMismatch, + CORBA::tk_except, + sizeof (_oc_CORBA_DynAny_TypeMismatch), + (char *) &_oc_CORBA_DynAny_TypeMismatch, 0 ); -CORBA::TypeCode_ptr CORBA_DynAny::_tc_TypeMismatch = +CORBA::TypeCode_ptr CORBA_DynAny::_tc_TypeMismatch = &_tc__tc_CORBA_DynAny_TypeMismatch; // default constructor @@ -336,19 +336,19 @@ CORBA_DynAny::InvalidSeq::InvalidSeq ( CORBA_DynAny::InvalidSeq& CORBA_DynAny::InvalidSeq::operator= ( const CORBA_DynAny::InvalidSeq &_tao_excp - ) + ) { this->CORBA_UserException::operator= (_tao_excp); return *this; } // narrow -CORBA_DynAny::InvalidSeq_ptr +CORBA_DynAny::InvalidSeq_ptr CORBA_DynAny::InvalidSeq::_narrow (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidSeq:1.0", + if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidSeq:1.0", exc->_id ())) // same type - return ACE_dynamic_cast (CORBA_DynAny::InvalidSeq_ptr, + return ACE_dynamic_cast (CORBA_DynAny::InvalidSeq_ptr, exc); else return 0; @@ -369,29 +369,29 @@ CORBA::Exception *CORBA_DynAny::InvalidSeq::_alloc (void) static const CORBA::Long _oc_CORBA_DynAny_InvalidSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 27, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x416e792f), - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696453), - ACE_NTOHL (0x65713a31), - ACE_NTOHL (0x2e3000fd), // repository ID = + 27, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x416e792f), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696453), + ACE_NTOHL (0x65713a31), + ACE_NTOHL (0x2e3000fd), // repository ID = // IDL:/CORBA_DynAny/InvalidSeq:1.0 - 11, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696453), + 11, + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696453), ACE_NTOHL (0x657100fd), // name = InvalidSeq 0, // member count }; static CORBA::TypeCode _tc__tc_CORBA_DynAny_InvalidSeq ( - CORBA::tk_except, - sizeof (_oc_CORBA_DynAny_InvalidSeq), - (char *) &_oc_CORBA_DynAny_InvalidSeq, + CORBA::tk_except, + sizeof (_oc_CORBA_DynAny_InvalidSeq), + (char *) &_oc_CORBA_DynAny_InvalidSeq, 0 ); -CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidSeq = +CORBA::TypeCode_ptr CORBA_DynAny::_tc_InvalidSeq = &_tc__tc_CORBA_DynAny_InvalidSeq; CORBA::TypeCode_ptr @@ -401,7 +401,7 @@ CORBA_DynAny::type (CORBA::Environment &) } void -CORBA_DynAny::assign (CORBA_DynAny_ptr CORBA_Dyn_any, +CORBA_DynAny::assign (CORBA_DynAny_ptr CORBA_Dyn_any, CORBA::Environment &env) { } @@ -418,7 +418,7 @@ CORBA_DynAny::destroy (CORBA::Environment &env) } void -CORBA_DynAny::from_any (const CORBA_Any& any, +CORBA_DynAny::from_any (const CORBA_Any& any, CORBA::Environment &env) { } @@ -454,97 +454,97 @@ CORBA_DynAny::rewind (CORBA::Environment &) } void -CORBA_DynAny::insert_boolean (CORBA::Boolean value, +CORBA_DynAny::insert_boolean (CORBA::Boolean value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_octet (CORBA::Octet value, +CORBA_DynAny::insert_octet (CORBA::Octet value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_char (CORBA::Char value, +CORBA_DynAny::insert_char (CORBA::Char value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_short (CORBA::Short value, +CORBA_DynAny::insert_short (CORBA::Short value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_ushort (CORBA::UShort value, +CORBA_DynAny::insert_ushort (CORBA::UShort value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_long (CORBA::Long value, +CORBA_DynAny::insert_long (CORBA::Long value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_ulong (CORBA::ULong value, +CORBA_DynAny::insert_ulong (CORBA::ULong value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_float (CORBA::Float value, +CORBA_DynAny::insert_float (CORBA::Float value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_double (CORBA::Double value, +CORBA_DynAny::insert_double (CORBA::Double value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_string (const char * value, +CORBA_DynAny::insert_string (const char * value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_reference (CORBA::Object_ptr value, +CORBA_DynAny::insert_reference (CORBA::Object_ptr value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_typecode (CORBA::TypeCode_ptr value, +CORBA_DynAny::insert_typecode (CORBA::TypeCode_ptr value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_longlong (CORBA::LongLong value, +CORBA_DynAny::insert_longlong (CORBA::LongLong value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_ulonglong (CORBA::ULongLong value, +CORBA_DynAny::insert_ulonglong (CORBA::ULongLong value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_wchar (CORBA::WChar value, +CORBA_DynAny::insert_wchar (CORBA::WChar value, CORBA::Environment &env) { } void -CORBA_DynAny::insert_any (const CORBA::Any& value, +CORBA_DynAny::insert_any (const CORBA::Any& value, CORBA::Environment &env) { } @@ -624,7 +624,12 @@ CORBA_DynAny::get_typecode (CORBA::Environment &env) CORBA::LongLong CORBA_DynAny::get_longlong (CORBA::Environment &env) { +#if defined (ACE_LACKS_LONGLONG_T) + CORBA::LongLong tmp = {0, 0}; + return tmp; +#else /* ! ACE_LACKS_LONGLONG_T */ return 0; +#endif /* ! ACE_LACKS_LONGLONG_T */ } CORBA::ULongLong @@ -645,16 +650,16 @@ CORBA_DynAny::get_any (CORBA::Environment &env) return 0; } -CORBA::Boolean CORBA_DynAny::_is_a (const CORBA::Char *value, +CORBA::Boolean CORBA_DynAny::_is_a (const CORBA::Char *value, CORBA::Environment &env) { - if ((!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynAny:1.0")) - || (!ACE_OS::strcmp ((char *)value, + if ((!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynAny:1.0")) + || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, + return this->CORBA_Object::_is_a (value, env); // remote call } @@ -666,19 +671,19 @@ const char* CORBA_DynAny::_interface_repository_id (void) const static const CORBA::Long _oc_CORBA_DynAny[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 16, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x416e793a), + 16, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x416e793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:/CORBA_DynAny:1.0 - 7, - ACE_NTOHL (0x44796e41), + 7, + ACE_NTOHL (0x44796e41), ACE_NTOHL (0x6e7900fd), // name = CORBA_DynAny, }; static CORBA::TypeCode _tc__tc_CORBA_DynAny ( - CORBA::tk_objref, - sizeof (_oc_CORBA_DynAny), - (char *) &_oc_CORBA_DynAny, + CORBA::tk_objref, + sizeof (_oc_CORBA_DynAny), + (char *) &_oc_CORBA_DynAny, 0 ); @@ -688,7 +693,7 @@ CORBA_DynEnum_ptr CORBA_DynEnum::_duplicate (CORBA_DynEnum_ptr obj) { if (!CORBA::is_nil (obj)) obj->_incr_refcnt (); - + return obj; } // end of _duplicate @@ -718,7 +723,7 @@ CORBA_DynEnum_ptr CORBA_DynEnum::_narrow (CORBA::Object_ptr obj, void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynEnum:1.0"); return new POA_CORBA::_tao_collocated_DynEnum ( - ACE_reinterpret_cast (POA_CORBA::DynEnum_ptr, + ACE_reinterpret_cast (POA_CORBA::DynEnum_ptr, servant), stub ); @@ -729,42 +734,42 @@ CORBA_DynEnum_ptr CORBA_DynEnum::_nil (void) return (CORBA_DynEnum_ptr) NULL; } // end of _nil -char* +char* CORBA_DynEnum::value_as_string (CORBA::Environment& env) { return 0; } -void +void CORBA_DynEnum::value_as_string (const char* value_as_string, CORBA::Environment& env) { } -CORBA::ULong +CORBA::ULong CORBA_DynEnum::value_as_ulong (CORBA::Environment&) { return 0; } -void +void CORBA_DynEnum::value_as_ulong (CORBA::ULong value_as_ulong, CORBA::Environment& env) { } -CORBA::Boolean CORBA_DynEnum::_is_a (const CORBA::Char *value, +CORBA::Boolean CORBA_DynEnum::_is_a (const CORBA::Char *value, CORBA::Environment &env) { - if ((!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynEnum:1.0")) - || (!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynAny:1.0")) + if ((!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynEnum:1.0")) + || (!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynAny:1.0")) || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, + return this->CORBA_Object::_is_a (value, env); // remote call } @@ -776,19 +781,19 @@ const char* CORBA_DynEnum::_interface_repository_id (void) const static const CORBA::Long _oc_CORBA_DynEnum[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 17, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x456e756d), - ACE_NTOHL (0x3a312e30), + 17, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x456e756d), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:/CORBA_DynEnum:1.0 - 8, - ACE_NTOHL (0x44796e45), + 8, + ACE_NTOHL (0x44796e45), ACE_NTOHL (0x6e756d00), // name = CORBA_DynEnum, }; -static CORBA::TypeCode _tc__tc_CORBA_DynEnum (CORBA::tk_objref, - sizeof (_oc_CORBA_DynEnum), - (char *) &_oc_CORBA_DynEnum, +static CORBA::TypeCode _tc__tc_CORBA_DynEnum (CORBA::tk_objref, + sizeof (_oc_CORBA_DynEnum), + (char *) &_oc_CORBA_DynEnum, 0); CORBA::TypeCode_ptr _tc_CORBA_DynEnum = &_tc__tc_CORBA_DynEnum; @@ -796,22 +801,22 @@ CORBA::TypeCode_ptr _tc_CORBA_DynEnum = &_tc__tc_CORBA_DynEnum; static const CORBA::Long _oc_FieldName[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 19, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f466965), - ACE_NTOHL (0x6c644e61), - ACE_NTOHL (0x6d653a31), + 19, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f466965), + ACE_NTOHL (0x6c644e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:/FieldName:1.0 - 10, - ACE_NTOHL (0x4669656c), - ACE_NTOHL (0x644e616d), + 10, + ACE_NTOHL (0x4669656c), + ACE_NTOHL (0x644e616d), ACE_NTOHL (0x6500fdfd), // name = FieldName - CORBA::tk_string, + CORBA::tk_string, 0, // string length }; -static CORBA::TypeCode _tc__tc_FieldName (CORBA::tk_alias, - sizeof (_oc_FieldName), - (char *) &_oc_FieldName, +static CORBA::TypeCode _tc__tc_FieldName (CORBA::tk_alias, + sizeof (_oc_FieldName), + (char *) &_oc_FieldName, 0); CORBA::TypeCode_ptr _tc_FieldName = &_tc__tc_FieldName; @@ -819,17 +824,17 @@ CORBA::TypeCode_ptr _tc_FieldName = &_tc__tc_FieldName; static const CORBA::Long _oc_NameValuePair[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 23, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f4e616d), - ACE_NTOHL (0x6556616c), - ACE_NTOHL (0x75655061), - ACE_NTOHL (0x69723a31), + 23, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f4e616d), + ACE_NTOHL (0x6556616c), + ACE_NTOHL (0x75655061), + ACE_NTOHL (0x69723a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:/NameValuePair:1.0 - 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65506169), + 14, + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65506169), ACE_NTOHL (0x7200fdfd), // name = NameValuePair 2, // member count 3, @@ -837,27 +842,27 @@ static const CORBA::Long _oc_NameValuePair[] = CORBA::tk_alias, // typecode kind for typedefs 52, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 19, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f466965), - ACE_NTOHL (0x6c644e61), - ACE_NTOHL (0x6d653a31), + 19, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f466965), + ACE_NTOHL (0x6c644e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:/FieldName:1.0 - 10, - ACE_NTOHL (0x4669656c), - ACE_NTOHL (0x644e616d), + 10, + ACE_NTOHL (0x4669656c), + ACE_NTOHL (0x644e616d), ACE_NTOHL (0x6500fdfd), // name = FieldName - CORBA::tk_string, + CORBA::tk_string, 0, // string length - 6, - ACE_NTOHL (0x76616c75), + 6, + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x6500fdfd), // name = value CORBA::tk_any, }; -static CORBA::TypeCode _tc__tc_NameValuePair (CORBA::tk_struct, - sizeof (_oc_NameValuePair), - (char *) &_oc_NameValuePair, +static CORBA::TypeCode _tc__tc_NameValuePair (CORBA::tk_struct, + sizeof (_oc_NameValuePair), + (char *) &_oc_NameValuePair, 0); CORBA::TypeCode_ptr _tc_NameValuePair = &_tc__tc_NameValuePair; @@ -873,38 +878,38 @@ CORBA::TypeCode_ptr _tc_NameValuePair = &_tc__tc_NameValuePair; NameValuePairSeq::NameValuePairSeq (void) {} NameValuePairSeq::NameValuePairSeq (CORBA::ULong max) // uses max size - : + : #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_NameValuePairSeq #else /* AHETI */ TAO_Unbounded_Sequence<NameValuePair> -#endif /* AHETI */ +#endif /* AHETI */ (max) {} -NameValuePairSeq::NameValuePairSeq (CORBA::ULong max, - CORBA::ULong length, - NameValuePair *buffer, +NameValuePairSeq::NameValuePairSeq (CORBA::ULong max, + CORBA::ULong length, + NameValuePair *buffer, CORBA::Boolean release) - : + : #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_NameValuePairSeq #else /* AHETI */ TAO_Unbounded_Sequence<NameValuePair> -#endif /* AHETI */ +#endif /* AHETI */ (max, length, buffer, release) {} NameValuePairSeq::NameValuePairSeq ( const NameValuePairSeq &seq ) // copy ctor - : + : #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_NameValuePairSeq #else /* AHETI */ TAO_Unbounded_Sequence<NameValuePair> -#endif /* AHETI */ +#endif /* AHETI */ (seq) {} NameValuePairSeq::~NameValuePairSeq (void) // dtor @@ -916,19 +921,19 @@ NameValuePairSeq::~NameValuePairSeq (void) // dtor static const CORBA::Long _oc_NameValuePairSeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 26, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f4e616d), - ACE_NTOHL (0x6556616c), - ACE_NTOHL (0x75655061), - ACE_NTOHL (0x69725365), - ACE_NTOHL (0x713a312e), + 26, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f4e616d), + ACE_NTOHL (0x6556616c), + ACE_NTOHL (0x75655061), + ACE_NTOHL (0x69725365), + ACE_NTOHL (0x713a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:/NameValuePairSeq:1.0 - 17, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65506169), - ACE_NTOHL (0x72536571), + 17, + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65506169), + ACE_NTOHL (0x72536571), ACE_NTOHL (0xfdfdfd), // name = NameValuePairSeq CORBA::tk_sequence, // typecode kind 156, // encapsulation length @@ -936,47 +941,47 @@ static const CORBA::Long _oc_NameValuePairSeq[] = CORBA::tk_struct, // typecode kind 140, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 23, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f4e616d), - ACE_NTOHL (0x6556616c), - ACE_NTOHL (0x75655061), - ACE_NTOHL (0x69723a31), + 23, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f4e616d), + ACE_NTOHL (0x6556616c), + ACE_NTOHL (0x75655061), + ACE_NTOHL (0x69723a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:/NameValuePair:1.0 - 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x56616c75), - ACE_NTOHL (0x65506169), + 14, + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x65506169), ACE_NTOHL (0x7200fdfd), // name = NameValuePair 2, // member count - 3, + 3, ACE_NTOHL (0x696400fd), // name = id CORBA::tk_alias, // typecode kind for typedefs 52, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order - 19, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f466965), - ACE_NTOHL (0x6c644e61), - ACE_NTOHL (0x6d653a31), + 19, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f466965), + ACE_NTOHL (0x6c644e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:/FieldName:1.0 - 10, - ACE_NTOHL (0x4669656c), - ACE_NTOHL (0x644e616d), + 10, + ACE_NTOHL (0x4669656c), + ACE_NTOHL (0x644e616d), ACE_NTOHL (0x6500fdfd), // name = FieldName - CORBA::tk_string, + CORBA::tk_string, 0, // string length - 6, - ACE_NTOHL (0x76616c75), + 6, + ACE_NTOHL (0x76616c75), ACE_NTOHL (0x6500fdfd), // name = value CORBA::tk_any, 0, }; static CORBA::TypeCode _tc__tc_NameValuePairSeq ( - CORBA::tk_alias, - sizeof (_oc_NameValuePairSeq), - (char *) &_oc_NameValuePairSeq, + CORBA::tk_alias, + sizeof (_oc_NameValuePairSeq), + (char *) &_oc_NameValuePairSeq, 0 ); @@ -986,7 +991,7 @@ CORBA_DynStruct_ptr CORBA_DynStruct::_duplicate (CORBA_DynStruct_ptr obj) { if (!CORBA::is_nil (obj)) obj->_incr_refcnt (); - + return obj; } // end of _duplicate @@ -1017,7 +1022,7 @@ CORBA_DynStruct_ptr CORBA_DynStruct::_narrow (CORBA::Object_ptr obj, void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynStruct:1.0"); return new POA_CORBA::_tao_collocated_DynStruct ( - ACE_reinterpret_cast (POA_CORBA::DynStruct_ptr, + ACE_reinterpret_cast (POA_CORBA::DynStruct_ptr, servant), stub ); @@ -1040,30 +1045,30 @@ CORBA_DynStruct::current_member_kind (CORBA::Environment& env) return CORBA::tk_null; } -NameValuePairSeq* +NameValuePairSeq* CORBA_DynStruct::get_members (CORBA::Environment& env) { return 0; } -void +void CORBA_DynStruct::set_members (const NameValuePairSeq& value, CORBA::Environment& env) { } -CORBA::Boolean CORBA_DynStruct::_is_a (const CORBA::Char *value, +CORBA::Boolean CORBA_DynStruct::_is_a (const CORBA::Char *value, CORBA::Environment &env) { - if ((!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynStruct:1.0")) - || (!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynAny:1.0")) - || (!ACE_OS::strcmp ((char *)value, + if ((!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynStruct:1.0")) + || (!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynAny:1.0")) + || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, + return this->CORBA_Object::_is_a (value, env); // remote call } @@ -1075,22 +1080,22 @@ const char* CORBA_DynStruct::_interface_repository_id (void) const static const CORBA::Long _oc_CORBA_DynStruct[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 19, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x53747275), - ACE_NTOHL (0x63743a31), + 19, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x53747275), + ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e3000fd), // repository ID = IDL:/CORBA_DynStruct:1.0 - 10, - ACE_NTOHL (0x44796e53), - ACE_NTOHL (0x74727563), + 10, + ACE_NTOHL (0x44796e53), + ACE_NTOHL (0x74727563), ACE_NTOHL (0x7400fdfd), // name = CORBA_DynStruct, }; static CORBA::TypeCode _tc__tc_CORBA_DynStruct ( - CORBA::tk_objref, - sizeof (_oc_CORBA_DynStruct), - (char *) &_oc_CORBA_DynStruct, + CORBA::tk_objref, + sizeof (_oc_CORBA_DynStruct), + (char *) &_oc_CORBA_DynStruct, 0 ); @@ -1100,7 +1105,7 @@ CORBA_DynUnion_ptr CORBA_DynUnion::_duplicate (CORBA_DynUnion_ptr obj) { if (!CORBA::is_nil (obj)) obj->_incr_refcnt (); - + return obj; } // end of _duplicate @@ -1110,7 +1115,7 @@ CORBA_DynUnion_ptr CORBA_DynUnion::_narrow (CORBA::Object_ptr obj, if (CORBA::is_nil (obj)) return CORBA_DynUnion::_nil (); - if (!obj->_is_a ("IDL:/CORBA_DynUnion:1.0", + if (!obj->_is_a ("IDL:/CORBA_DynUnion:1.0", env)) return CORBA_DynUnion::_nil (); @@ -1131,7 +1136,7 @@ CORBA_DynUnion_ptr CORBA_DynUnion::_narrow (CORBA::Object_ptr obj, void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynUnion:1.0"); return new POA_CORBA::_tao_collocated_DynUnion ( - ACE_reinterpret_cast (POA_CORBA::DynUnion_ptr, + ACE_reinterpret_cast (POA_CORBA::DynUnion_ptr, servant), stub ); @@ -1142,7 +1147,7 @@ CORBA_DynUnion_ptr CORBA_DynUnion::_nil (void) return (CORBA_DynUnion_ptr) NULL; } // end of _nil -CORBA::Boolean +CORBA::Boolean CORBA_DynUnion::set_as_default (CORBA::Environment& env) { return 0; @@ -1154,55 +1159,55 @@ CORBA_DynUnion::set_as_default (CORBA::Boolean set_as_default, { } -CORBA_DynAny_ptr +CORBA_DynAny_ptr CORBA_DynUnion::discriminator (CORBA::Environment& env) { return 0; } -CORBA::TCKind +CORBA::TCKind CORBA_DynUnion::discriminator_kind (CORBA::Environment& env) { return CORBA::tk_null; } -CORBA_DynAny_ptr +CORBA_DynAny_ptr CORBA_DynUnion::member (CORBA::Environment& env) { return 0; } -char* +char* CORBA_DynUnion::member_name (CORBA::Environment& env) { return 0; } -void +void CORBA_DynUnion::member_name (const char* member_name, CORBA::Environment& env) { } -CORBA::TCKind +CORBA::TCKind CORBA_DynUnion::member_kind (CORBA::Environment& env) { return CORBA::tk_null; } -CORBA::Boolean CORBA_DynUnion::_is_a (const CORBA::Char *value, +CORBA::Boolean CORBA_DynUnion::_is_a (const CORBA::Char *value, CORBA::Environment &env) { - if ((!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynUnion:1.0")) - || (!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynAny:1.0")) - || (!ACE_OS::strcmp ((char *)value, + if ((!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynUnion:1.0")) + || (!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynAny:1.0")) + || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, + return this->CORBA_Object::_is_a (value, env); // remote call } @@ -1214,22 +1219,22 @@ const char* CORBA_DynUnion::_interface_repository_id (void) const static const CORBA::Long _oc_CORBA_DynUnion[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 18, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x556e696f), - ACE_NTOHL (0x6e3a312e), + 18, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x556e696f), + ACE_NTOHL (0x6e3a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:/CORBA_DynUnion:1.0 - 9, - ACE_NTOHL (0x44796e55), - ACE_NTOHL (0x6e696f6e), + 9, + ACE_NTOHL (0x44796e55), + ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0xfdfdfd), // name = CORBA_DynUnion, }; static CORBA::TypeCode _tc__tc_CORBA_DynUnion ( - CORBA::tk_objref, - sizeof (_oc_CORBA_DynUnion), - (char *) &_oc_CORBA_DynUnion, + CORBA::tk_objref, + sizeof (_oc_CORBA_DynUnion), + (char *) &_oc_CORBA_DynUnion, 0 ); @@ -1246,36 +1251,36 @@ CORBA::TypeCode_ptr _tc_CORBA_DynUnion = &_tc__tc_CORBA_DynUnion; AnySeq::AnySeq (void) {} AnySeq::AnySeq (CORBA::ULong max) // uses max size - : + : #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_AnySeq #else /* AHETI */ TAO_Unbounded_Sequence<CORBA::Any> -#endif /* AHETI */ +#endif /* AHETI */ (max) {} -AnySeq::AnySeq (CORBA::ULong max, - CORBA::ULong length, - CORBA::Any *buffer, +AnySeq::AnySeq (CORBA::ULong max, + CORBA::ULong length, + CORBA::Any *buffer, CORBA::Boolean release) - : + : #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_AnySeq #else /* AHETI */ TAO_Unbounded_Sequence<CORBA::Any> -#endif /* AHETI */ +#endif /* AHETI */ (max, length, buffer, release) {} AnySeq::AnySeq (const AnySeq &seq) // copy ctor - : + : #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \ || !defined (TAO_LACKS_TEMPLATE_SPECIALIZATION) _TAO_Unbounded_Sequence_AnySeq #else /* AHETI */ TAO_Unbounded_Sequence<CORBA::Any> -#endif /* AHETI */ +#endif /* AHETI */ (seq) {} AnySeq::~AnySeq (void) // dtor @@ -1287,13 +1292,13 @@ AnySeq::~AnySeq (void) // dtor static const CORBA::Long _oc_AnySeq[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 16, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f416e79), - ACE_NTOHL (0x5365713a), + 16, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f416e79), + ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:/AnySeq:1.0 - 7, - ACE_NTOHL (0x416e7953), + 7, + ACE_NTOHL (0x416e7953), ACE_NTOHL (0x657100fd), // name = AnySeq CORBA::tk_sequence, // typecode kind 12, // encapsulation length @@ -1302,9 +1307,9 @@ static const CORBA::Long _oc_AnySeq[] = 0, }; -static CORBA::TypeCode _tc__tc_AnySeq (CORBA::tk_alias, - sizeof (_oc_AnySeq), - (char *) &_oc_AnySeq, +static CORBA::TypeCode _tc__tc_AnySeq (CORBA::tk_alias, + sizeof (_oc_AnySeq), + (char *) &_oc_AnySeq, 0); CORBA::TypeCode_ptr _tc_AnySeq = &_tc__tc_AnySeq; @@ -1315,7 +1320,7 @@ CORBA_DynSequence_ptr CORBA_DynSequence::_duplicate ( { if (!CORBA::is_nil (obj)) obj->_incr_refcnt (); - + return obj; } // end of _duplicate @@ -1325,7 +1330,7 @@ CORBA_DynSequence_ptr CORBA_DynSequence::_narrow (CORBA::Object_ptr obj, if (CORBA::is_nil (obj)) return CORBA_DynSequence::_nil (); - if (!obj->_is_a ("IDL:/CORBA_DynSequence:1.0", + if (!obj->_is_a ("IDL:/CORBA_DynSequence:1.0", env)) return CORBA_DynSequence::_nil (); @@ -1341,11 +1346,11 @@ CORBA_DynSequence_ptr CORBA_DynSequence::_narrow (CORBA::Object_ptr obj, STUB_Object *stub = obj->_servant ()->_create_stub (env); if (env.exception () != 0) - return CORBA_DynSequence::_nil (); + return CORBA_DynSequence::_nil (); void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynSequence:1.0"); return new POA_CORBA::_tao_collocated_DynSequence ( - ACE_reinterpret_cast (POA_CORBA::DynSequence_ptr, + ACE_reinterpret_cast (POA_CORBA::DynSequence_ptr, servant), stub ); @@ -1356,42 +1361,42 @@ CORBA_DynSequence_ptr CORBA_DynSequence::_nil (void) return (CORBA_DynSequence_ptr)NULL; } // end of _nil -CORBA::ULong +CORBA::ULong CORBA_DynSequence::length (CORBA::Environment &) { return 0; } -void +void CORBA_DynSequence::length (CORBA::ULong length, CORBA::Environment& env) { } -AnySeq_ptr +AnySeq_ptr CORBA_DynSequence::get_elements (CORBA::Environment& env) { return 0; } -void +void CORBA_DynSequence::set_elements (const AnySeq& value, CORBA::Environment& env) { } -CORBA::Boolean CORBA_DynSequence::_is_a (const CORBA::Char *value, +CORBA::Boolean CORBA_DynSequence::_is_a (const CORBA::Char *value, CORBA::Environment &env) { - if((!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynSequence:1.0")) - || (!ACE_OS::strcmp ((char *) value, - "IDL:/CORBA_DynAny:1.0")) - || (!ACE_OS::strcmp ((char *) value, + if((!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynSequence:1.0")) + || (!ACE_OS::strcmp ((char *) value, + "IDL:/CORBA_DynAny:1.0")) + || (!ACE_OS::strcmp ((char *) value, CORBA::_tc_Object->id (env)))) return 1; // success using local knowledge else - return this->CORBA_Object::_is_a (value, + return this->CORBA_Object::_is_a (value, env); // remote call } @@ -1403,34 +1408,34 @@ const char* CORBA_DynSequence::_interface_repository_id (void) const static const CORBA::Long _oc_CORBA_DynSequence[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 21, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x53657175), - ACE_NTOHL (0x656e6365), - ACE_NTOHL (0x3a312e30), + 21, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x53657175), + ACE_NTOHL (0x656e6365), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd), // repository ID = IDL:/CORBA_DynSequence:1.0 - 12, - ACE_NTOHL (0x44796e53), - ACE_NTOHL (0x65717565), + 12, + ACE_NTOHL (0x44796e53), + ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = CORBA_DynSequence, }; static CORBA::TypeCode _tc__tc_CORBA_DynSequence ( - CORBA::tk_objref, - sizeof (_oc_CORBA_DynSequence), - (char *) &_oc_CORBA_DynSequence, + CORBA::tk_objref, + sizeof (_oc_CORBA_DynSequence), + (char *) &_oc_CORBA_DynSequence, 0 ); -CORBA::TypeCode_ptr _tc_CORBA_DynSequence = +CORBA::TypeCode_ptr _tc_CORBA_DynSequence = &_tc__tc_CORBA_DynSequence; CORBA_DynArray_ptr CORBA_DynArray::_duplicate (CORBA_DynArray_ptr obj) { if (!CORBA::is_nil (obj)) obj->_incr_refcnt (); - + return obj; } // end of _duplicate @@ -1440,7 +1445,7 @@ CORBA_DynArray_ptr CORBA_DynArray::_narrow (CORBA::Object_ptr obj, if (CORBA::is_nil (obj)) return CORBA_DynArray::_nil (); - if (!obj->_is_a ("IDL:/CORBA_DynArray:1.0", + if (!obj->_is_a ("IDL:/CORBA_DynArray:1.0", env)) return CORBA_DynArray::_nil (); @@ -1461,7 +1466,7 @@ CORBA_DynArray_ptr CORBA_DynArray::_narrow (CORBA::Object_ptr obj, void* servant = obj->_servant ()->_downcast ("IDL:/CORBA_DynArray:1.0"); return new POA_CORBA::_tao_collocated_DynArray ( - ACE_reinterpret_cast (POA_CORBA::DynArray_ptr, + ACE_reinterpret_cast (POA_CORBA::DynArray_ptr, servant), stub ); @@ -1472,26 +1477,26 @@ CORBA_DynArray_ptr CORBA_DynArray::_nil (void) return (CORBA_DynArray_ptr) NULL; } // end of _nil -AnySeq_ptr +AnySeq_ptr CORBA_DynArray::get_elements (CORBA::Environment& env) { return 0; } -void +void CORBA_DynArray::set_elements (const AnySeq& value, CORBA::Environment& env) { } -CORBA::Boolean CORBA_DynArray::_is_a (const CORBA::Char *value, +CORBA::Boolean CORBA_DynArray::_is_a (const CORBA::Char *value, CORBA::Environment &env) { - if ((!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynArray:1.0")) - || (!ACE_OS::strcmp ((char *)value, - "IDL:/CORBA_DynAny:1.0")) - || (!ACE_OS::strcmp ((char *)value, + if ((!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynArray:1.0")) + || (!ACE_OS::strcmp ((char *)value, + "IDL:/CORBA_DynAny:1.0")) + || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)))) return 1; // success using local knowledge else @@ -1506,25 +1511,25 @@ const char* CORBA_DynArray::_interface_repository_id (void) const static const CORBA::Long _oc_CORBA_DynArray[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 18, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x2f44796e), - ACE_NTOHL (0x41727261), - ACE_NTOHL (0x793a312e), + 18, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x2f44796e), + ACE_NTOHL (0x41727261), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd), // repository ID = IDL:/CORBA_DynArray:1.0 - 9, - ACE_NTOHL (0x44796e41), - ACE_NTOHL (0x72726179), + 9, + ACE_NTOHL (0x44796e41), + ACE_NTOHL (0x72726179), ACE_NTOHL (0xfdfdfd), // name = CORBA_DynArray, }; static CORBA::TypeCode _tc__tc_CORBA_DynArray ( - CORBA::tk_objref, - sizeof (_oc_CORBA_DynArray), - (char *) &_oc_CORBA_DynArray, + CORBA::tk_objref, + sizeof (_oc_CORBA_DynArray), + (char *) &_oc_CORBA_DynArray, 0 ); -CORBA::TypeCode_ptr _tc_CORBA_DynArray = +CORBA::TypeCode_ptr _tc_CORBA_DynArray = &_tc__tc_CORBA_DynArray; diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp index e63628dbb84..aaaa565ed9b 100644 --- a/TAO/tao/DynArray_i.cpp +++ b/TAO/tao/DynArray_i.cpp @@ -27,14 +27,14 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any) CORBA::Environment env; CORBA::TypeCode_ptr tc = this->type_.in (); - // The type will be correct if this constructor called from a - // factory function, but it could also be called by the - // user, so..... + // The type will be correct if this constructor called from a + // factory function, but it could also be called by the + // user, so..... if (TAO_DynAny_i::unalias (tc, env) == CORBA::tk_array) { CORBA::ULong numfields = this->get_arg_length (any.type (), env); - + // Resize the array. this->da_members_ = ACE_Array<CORBA_DynAny_var> (numfields); @@ -51,10 +51,10 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any) // This Any constructor is a TAO extension. CORBA_Any field_any (field_tc, cdr.start ()); - - // This recursive step will call the correct constructor + + // This recursive step will call the correct constructor // based on the type of field_any. - this->da_members_[i] = + this->da_members_[i] = TAO_DynAny_i::create_dyn_any (field_any, env); @@ -74,11 +74,11 @@ TAO_DynArray_i::TAO_DynArray_i (CORBA_TypeCode_ptr tc) CORBA::Environment env; // Need to check if called by user. - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_array) { - CORBA::ULong numfields = this->get_arg_length (tc, + CORBA::ULong numfields = this->get_arg_length (tc, env); // Resize the array. @@ -90,7 +90,7 @@ TAO_DynArray_i::TAO_DynArray_i (CORBA_TypeCode_ptr tc) this->da_members_[i] = 0; } else - env.exception (new CORBA_ORB_InconsistentTypeCode); + env.exception (new CORBA_ORB_InconsistentTypeCode); } TAO_DynArray_i::~TAO_DynArray_i (void) @@ -100,7 +100,7 @@ TAO_DynArray_i::~TAO_DynArray_i (void) /////////////////////////////////////////////////////////////////////// // Functions specific to DynArray -AnySeq_ptr +AnySeq_ptr TAO_DynArray_i::get_elements (CORBA::Environment& _env) { CORBA::ULong length = this->da_members_.size (); @@ -110,7 +110,7 @@ TAO_DynArray_i::get_elements (CORBA::Environment& _env) // Arg only sets maximum, so... AnySeq_ptr elements; - + ACE_NEW_THROW_RETURN (elements, AnySeq (length), CORBA::NO_MEMORY, @@ -126,7 +126,7 @@ TAO_DynArray_i::get_elements (CORBA::Environment& _env) return elements; } -void +void TAO_DynArray_i::set_elements (const AnySeq& value, CORBA::Environment& env) { @@ -141,7 +141,7 @@ TAO_DynArray_i::set_elements (const AnySeq& value, env.exception (new CORBA_DynAny::InvalidSeq); return; } - + CORBA::TypeCode_ptr element_type = this->get_element_type (env); for (CORBA::ULong i = 0; i < length; i++) @@ -149,8 +149,8 @@ TAO_DynArray_i::set_elements (const AnySeq& value, // Check each arg element for type match. if (value[i].type ()->equal (element_type, env)) - this->da_members_[i] = - TAO_DynAny_i::create_dyn_any (value[i], + this->da_members_[i] = + TAO_DynAny_i::create_dyn_any (value[i], env); else @@ -165,13 +165,13 @@ TAO_DynArray_i::set_elements (const AnySeq& value, // Common functions void -TAO_DynArray_i::assign (CORBA_DynAny_ptr dyn_any, +TAO_DynArray_i::assign (CORBA_DynAny_ptr dyn_any, CORBA::Environment &env) { // *dyn_any->to_any raises Invalid if arg is bad. - if (this->type_.in ()->equal (dyn_any->type (env), + if (this->type_.in ()->equal (dyn_any->type (env), env)) - this->from_any (*dyn_any->to_any (env), + this->from_any (*dyn_any->to_any (env), env); else env.exception (new CORBA_DynAny::Invalid); @@ -181,7 +181,7 @@ CORBA_DynAny_ptr TAO_DynArray_i::copy (CORBA::Environment &env) { CORBA_Any_ptr a = this->to_any (env); - return TAO_DynAny_i::create_dyn_any (*a, + return TAO_DynAny_i::create_dyn_any (*a, env); } @@ -197,7 +197,7 @@ TAO_DynArray_i::destroy (CORBA::Environment &env) } void -TAO_DynArray_i::from_any (const CORBA_Any& any, +TAO_DynArray_i::from_any (const CORBA_Any& any, CORBA::Environment &env) { if (this->type_.in ()->equal (any.type (), env)) @@ -219,7 +219,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any, env.exception (new CORBA_DynAny::Invalid); return; } - + CORBA::TypeCode_ptr field_tc = this->get_element_type (env); for (CORBA::ULong i = 0; i < arg_length; i++) @@ -227,11 +227,11 @@ TAO_DynArray_i::from_any (const CORBA_Any& any, // This Any constructor is a TAO extension. CORBA_Any field_any (field_tc, cdr.start ()); - + // Actually a recursive step. Can't call from_any() // recursively because maybe only the top level is created, // but create_dyn_any will do the right thing. - this->da_members_[i] = + this->da_members_[i] = TAO_DynAny_i::create_dyn_any (field_any, env); @@ -262,7 +262,7 @@ TAO_DynArray_i::to_any (CORBA::Environment& _env) // Recursive step CORBA_Any_ptr field_any = this->da_members_[i]->to_any (_env); - ACE_Message_Block* field_mb = + ACE_Message_Block* field_mb = ACE_Message_Block::duplicate (field_any->_tao_get_cdr ()); TAO_InputCDR field_cdr (field_mb); @@ -296,8 +296,8 @@ TAO_DynArray_i::current_component (CORBA::Environment &env) return 0; if (!this->da_members_[this->index_].in ()) - this->da_members_[this->index_] = - TAO_DynAny_i::create_dyn_any (this->get_element_type (env), + this->da_members_[this->index_] = + TAO_DynAny_i::create_dyn_any (this->get_element_type (env), env); return this->da_members_[this->index_].in (); @@ -316,7 +316,7 @@ TAO_DynArray_i::next (CORBA::Environment &) } CORBA::Boolean -TAO_DynArray_i::seek (CORBA::Long index, +TAO_DynArray_i::seek (CORBA::Long index, CORBA::Environment &) { if (index < 0 || index >= (CORBA::Long) this->da_members_.size ()) @@ -333,7 +333,7 @@ TAO_DynArray_i::rewind (CORBA::Environment &) } //////////////////////////////////////////////////////////////////////// -// The insert-primitive and get-primitive functions are required +// The insert-primitive and get-primitive functions are required // by the spec of all types of DynAny, although if the top level // members aren't primitive types, these functions aren't too helpful. // Also, while not mentioned in the spec, the example code seems to @@ -344,12 +344,12 @@ TAO_DynArray_i::rewind (CORBA::Environment &) // Insert functions void -TAO_DynArray_i::insert_boolean (CORBA::Boolean value, +TAO_DynArray_i::insert_boolean (CORBA::Boolean value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_boolean) { - this->current_component (env)->insert_boolean (value, + this->current_component (env)->insert_boolean (value, env); this->next (env); } @@ -358,12 +358,12 @@ TAO_DynArray_i::insert_boolean (CORBA::Boolean value, } void -TAO_DynArray_i::insert_octet (CORBA::Octet value, +TAO_DynArray_i::insert_octet (CORBA::Octet value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_octet) { - this->current_component (env)->insert_octet (value, + this->current_component (env)->insert_octet (value, env); this->next (env); } @@ -372,12 +372,12 @@ TAO_DynArray_i::insert_octet (CORBA::Octet value, } void -TAO_DynArray_i::insert_char (CORBA::Char value, +TAO_DynArray_i::insert_char (CORBA::Char value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_char) { - this->current_component (env)->insert_char (value, + this->current_component (env)->insert_char (value, env); this->next (env); } @@ -386,12 +386,12 @@ TAO_DynArray_i::insert_char (CORBA::Char value, } void -TAO_DynArray_i::insert_short (CORBA::Short value, +TAO_DynArray_i::insert_short (CORBA::Short value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_short) { - this->current_component (env)->insert_short (value, + this->current_component (env)->insert_short (value, env); this->next (env); } @@ -400,12 +400,12 @@ TAO_DynArray_i::insert_short (CORBA::Short value, } void -TAO_DynArray_i::insert_ushort (CORBA::UShort value, +TAO_DynArray_i::insert_ushort (CORBA::UShort value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_ushort) { - this->current_component (env)->insert_ushort (value, + this->current_component (env)->insert_ushort (value, env); this->next (env); } @@ -414,12 +414,12 @@ TAO_DynArray_i::insert_ushort (CORBA::UShort value, } void -TAO_DynArray_i::insert_long (CORBA::Long value, +TAO_DynArray_i::insert_long (CORBA::Long value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_long) { - this->current_component (env)->insert_long (value, + this->current_component (env)->insert_long (value, env); this->next (env); } @@ -428,12 +428,12 @@ TAO_DynArray_i::insert_long (CORBA::Long value, } void -TAO_DynArray_i::insert_ulong (CORBA::ULong value, +TAO_DynArray_i::insert_ulong (CORBA::ULong value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_long) { - this->current_component (env)->insert_ulong (value, + this->current_component (env)->insert_ulong (value, env); this->next (env); } @@ -442,12 +442,12 @@ TAO_DynArray_i::insert_ulong (CORBA::ULong value, } void -TAO_DynArray_i::insert_float (CORBA::Float value, +TAO_DynArray_i::insert_float (CORBA::Float value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_float) { - this->current_component (env)->insert_float (value, + this->current_component (env)->insert_float (value, env); this->next (env); } @@ -456,12 +456,12 @@ TAO_DynArray_i::insert_float (CORBA::Float value, } void -TAO_DynArray_i::insert_double (CORBA::Double value, +TAO_DynArray_i::insert_double (CORBA::Double value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_double) { - this->current_component (env)->insert_double (value, + this->current_component (env)->insert_double (value, env); this->next (env); } @@ -470,7 +470,7 @@ TAO_DynArray_i::insert_double (CORBA::Double value, } void -TAO_DynArray_i::insert_string (const char * value, +TAO_DynArray_i::insert_string (const char * value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_string) @@ -484,12 +484,12 @@ TAO_DynArray_i::insert_string (const char * value, } void -TAO_DynArray_i::insert_reference (CORBA::Object_ptr value, +TAO_DynArray_i::insert_reference (CORBA::Object_ptr value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_objref) { - this->current_component (env)->insert_reference (value, + this->current_component (env)->insert_reference (value, env); this->next (env); } @@ -498,7 +498,7 @@ TAO_DynArray_i::insert_reference (CORBA::Object_ptr value, } void -TAO_DynArray_i::insert_typecode (CORBA::TypeCode_ptr value, +TAO_DynArray_i::insert_typecode (CORBA::TypeCode_ptr value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_TypeCode) @@ -512,7 +512,7 @@ TAO_DynArray_i::insert_typecode (CORBA::TypeCode_ptr value, } void -TAO_DynArray_i::insert_longlong (CORBA::LongLong value, +TAO_DynArray_i::insert_longlong (CORBA::LongLong value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_longlong) @@ -526,7 +526,7 @@ TAO_DynArray_i::insert_longlong (CORBA::LongLong value, } void -TAO_DynArray_i::insert_ulonglong (CORBA::ULongLong value, +TAO_DynArray_i::insert_ulonglong (CORBA::ULongLong value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_ulonglong) @@ -540,7 +540,7 @@ TAO_DynArray_i::insert_ulonglong (CORBA::ULongLong value, } void -TAO_DynArray_i::insert_wchar (CORBA::WChar value, +TAO_DynArray_i::insert_wchar (CORBA::WChar value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_wchar) @@ -554,7 +554,7 @@ TAO_DynArray_i::insert_wchar (CORBA::WChar value, } void -TAO_DynArray_i::insert_any (const CORBA::Any& value, +TAO_DynArray_i::insert_any (const CORBA::Any& value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_any) @@ -571,7 +571,7 @@ TAO_DynArray_i::insert_any (const CORBA::Any& value, // Get functions // If the current component has not been intialized, these -// raise Invalid, which is not required by the spec, but which +// raise Invalid, which is not required by the spec, but which // seems like a courteous thing to do. CORBA::Boolean @@ -592,7 +592,7 @@ TAO_DynArray_i::get_boolean (CORBA::Environment &env) } else env.exception (new CORBA_DynAny::Invalid); - + return val; } @@ -841,7 +841,11 @@ TAO_DynArray_i::get_typecode (CORBA::Environment &env) CORBA::LongLong TAO_DynArray_i::get_longlong (CORBA::Environment &env) { +#if defined (ACE_LACKS_LONGLONG_T) + CORBA::LongLong val = {0, 0}; +#else /* ! ACE_LACKS_LONGLONG_T */ CORBA::LongLong val = 0; +#endif /* ! ACE_LACKS_LONGLONG_T */ CORBA_DynAny_ptr dp = this->da_members_[this->index_].in (); if (dp) diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp index 7cca3d52a11..80cce696ba3 100644 --- a/TAO/tao/DynEnum_i.cpp +++ b/TAO/tao/DynEnum_i.cpp @@ -24,9 +24,9 @@ TAO_DynEnum_i::TAO_DynEnum_i (const CORBA_Any& any) { CORBA::Environment env; - // The type will be correct if this constructor called from a - // factory function, but it could also be called by the - // user, so..... + // The type will be correct if this constructor called from a + // factory function, but it could also be called by the + // user, so..... if (TAO_DynAny_i::unalias (this->type_.in (), env) == CORBA::tk_enum) { // Get the CDR stream of the argument. @@ -48,8 +48,8 @@ TAO_DynEnum_i::TAO_DynEnum_i (CORBA_TypeCode_ptr tc) CORBA::Environment env; // Need to check if called by user. - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) != CORBA::tk_enum) env.exception (new CORBA_ORB_InconsistentTypeCode); } @@ -61,14 +61,14 @@ TAO_DynEnum_i::~TAO_DynEnum_i (void) ////////////////////////////////////////////////////////////////////// // Functions specific to DynEnum -char* +char* TAO_DynEnum_i::value_as_string (CORBA::Environment& env) { - return CORBA::string_dup (this->type_.in ()->member_name (this->value_, + return CORBA::string_dup (this->type_.in ()->member_name (this->value_, env)); } -void +void TAO_DynEnum_i::value_as_string (const char* value_as_string, CORBA::Environment& env) { @@ -76,8 +76,8 @@ TAO_DynEnum_i::value_as_string (const char* value_as_string, CORBA::ULong i; for (i = 0; i < count; i++) - if (!ACE_OS::strcmp (value_as_string, - this->type_.in ()->member_name (i, + if (!ACE_OS::strcmp (value_as_string, + this->type_.in ()->member_name (i, env))) break; @@ -88,13 +88,13 @@ TAO_DynEnum_i::value_as_string (const char* value_as_string, env.exception (new CORBA_DynAny::InvalidValue); } -CORBA::ULong +CORBA::ULong TAO_DynEnum_i::value_as_ulong (CORBA::Environment&) { return this->value_; } -void +void TAO_DynEnum_i::value_as_ulong (CORBA::ULong value_as_ulong, CORBA::Environment& env) { @@ -109,13 +109,13 @@ TAO_DynEnum_i::value_as_ulong (CORBA::ULong value_as_ulong, // Common functions void -TAO_DynEnum_i::assign (CORBA_DynAny_ptr dyn_any, +TAO_DynEnum_i::assign (CORBA_DynAny_ptr dyn_any, CORBA::Environment &env) { // *dyn_any->to_any raises Invalid if arg is bad. - if (this->type_.in ()->equal (dyn_any->type (env), + if (this->type_.in ()->equal (dyn_any->type (env), env)) - this->from_any (*dyn_any->to_any (env), + this->from_any (*dyn_any->to_any (env), env); else env.exception (new CORBA_DynAny::Invalid); @@ -125,7 +125,7 @@ CORBA_DynAny_ptr TAO_DynEnum_i::copy (CORBA::Environment &env) { CORBA_Any_ptr a = this->to_any (env); - return TAO_DynAny_i::create_dyn_any (*a, + return TAO_DynAny_i::create_dyn_any (*a, env); } @@ -137,7 +137,7 @@ TAO_DynEnum_i::destroy (CORBA::Environment &env) } void -TAO_DynEnum_i::from_any (const CORBA_Any& any, +TAO_DynEnum_i::from_any (const CORBA_Any& any, CORBA::Environment &env) { if (TAO_DynAny_i::unalias (any.type (), env) == CORBA::tk_enum) @@ -189,7 +189,7 @@ TAO_DynEnum_i::next (CORBA::Environment &) } CORBA::Boolean -TAO_DynEnum_i::seek (CORBA::Long index, +TAO_DynEnum_i::seek (CORBA::Long index, CORBA::Environment &) { if (index == 0) @@ -212,112 +212,112 @@ TAO_DynEnum_i::rewind (CORBA::Environment &) // enlightening exception. void -TAO_DynEnum_i::insert_boolean (CORBA::Boolean value, +TAO_DynEnum_i::insert_boolean (CORBA::Boolean value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_octet (CORBA::Octet value, +TAO_DynEnum_i::insert_octet (CORBA::Octet value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_char (CORBA::Char value, +TAO_DynEnum_i::insert_char (CORBA::Char value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_short (CORBA::Short value, +TAO_DynEnum_i::insert_short (CORBA::Short value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_ushort (CORBA::UShort value, +TAO_DynEnum_i::insert_ushort (CORBA::UShort value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_long (CORBA::Long value, +TAO_DynEnum_i::insert_long (CORBA::Long value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_ulong (CORBA::ULong value, +TAO_DynEnum_i::insert_ulong (CORBA::ULong value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_float (CORBA::Float value, +TAO_DynEnum_i::insert_float (CORBA::Float value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_double (CORBA::Double value, +TAO_DynEnum_i::insert_double (CORBA::Double value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_string (const char * value, +TAO_DynEnum_i::insert_string (const char * value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_reference (CORBA::Object_ptr value, +TAO_DynEnum_i::insert_reference (CORBA::Object_ptr value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr value, +TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_longlong (CORBA::LongLong value, +TAO_DynEnum_i::insert_longlong (CORBA::LongLong value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong value, +TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_wchar (CORBA::WChar value, +TAO_DynEnum_i::insert_wchar (CORBA::WChar value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); } void -TAO_DynEnum_i::insert_any (const CORBA::Any& value, +TAO_DynEnum_i::insert_any (const CORBA::Any& value, CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); @@ -411,7 +411,13 @@ CORBA::LongLong TAO_DynEnum_i::get_longlong (CORBA::Environment &env) { env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + +#if defined (ACE_LACKS_LONGLONG_T) + CORBA::LongLong tmp = {0, 0}; + return tmp; +#else /* ! ACE_LACKS_LONGLONG_T */ return 0; +#endif /* ! ACE_LACKS_LONGLONG_T */ } CORBA::ULongLong diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp index bcf5ec56216..6b624ce8a96 100644 --- a/TAO/tao/DynSequence_i.cpp +++ b/TAO/tao/DynSequence_i.cpp @@ -26,11 +26,11 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any) { CORBA::Environment env; - // The type will be correct if this constructor called from a - // factory function, but it could also be called by the - // user, so..... - if (TAO_DynAny_i::unalias (this->type_.in (), - env) + // The type will be correct if this constructor called from a + // factory function, but it could also be called by the + // user, so..... + if (TAO_DynAny_i::unalias (this->type_.in (), + env) == CORBA::tk_sequence) { // Get the CDR stream of the argument. @@ -40,7 +40,7 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any) TAO_InputCDR cdr (mb); CORBA::ULong length; - + // If the any is a sequence, first 4 bytes of cdr hold the length. cdr.read_ulong (length); @@ -55,10 +55,10 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any) // This Any constructor is a TAO extension. CORBA_Any field_any (field_tc, cdr.start ()); - - // This recursive step will call the correct constructor + + // This recursive step will call the correct constructor // based on the type of field_any. - this->da_members_[i] = + this->da_members_[i] = TAO_DynAny_i::create_dyn_any (field_any, env); @@ -80,10 +80,10 @@ TAO_DynSequence_i::TAO_DynSequence_i (CORBA_TypeCode_ptr tc) CORBA::Environment env; // Need to check if called by user. - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) != CORBA::tk_sequence) - env.exception (new CORBA_ORB_InconsistentTypeCode); + env.exception (new CORBA_ORB_InconsistentTypeCode); } TAO_DynSequence_i::~TAO_DynSequence_i (void) @@ -93,7 +93,7 @@ TAO_DynSequence_i::~TAO_DynSequence_i (void) /////////////////////////////////////////////////////////////////////// // Functions specific to DynSequence -CORBA::ULong +CORBA::ULong TAO_DynSequence_i::length (CORBA::Environment &) { return this->da_members_.size (); @@ -102,7 +102,7 @@ TAO_DynSequence_i::length (CORBA::Environment &) // There is no way to resize an ACE_Array except by assignment to // another ACE_Array of a different size, so we have to copy over // and copy back, even if the result is only to decrease the size. -void +void TAO_DynSequence_i::length (CORBA::ULong length, CORBA::Environment& env) { @@ -113,7 +113,7 @@ TAO_DynSequence_i::length (CORBA::ULong length, ACE_Array<CORBA_DynAny_var> new_array (length); // Choose the shorter one for the loop bound. - CORBA::ULong len = + CORBA::ULong len = length > this->da_members_.size () ? this->da_members_.size () : length; // Copy over. @@ -125,7 +125,7 @@ TAO_DynSequence_i::length (CORBA::ULong length, this->da_members_ = new_array; } -AnySeq_ptr +AnySeq_ptr TAO_DynSequence_i::get_elements (CORBA::Environment& _env) { CORBA::ULong length = this->da_members_.size (); @@ -133,7 +133,7 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& _env) if (length == 0) return 0; - AnySeq_ptr elements; + AnySeq_ptr elements; ACE_NEW_THROW_RETURN (elements, AnySeq (length), CORBA::NO_MEMORY, @@ -149,7 +149,7 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& _env) return elements; } -void +void TAO_DynSequence_i::set_elements (const AnySeq& value, CORBA::Environment& env) { @@ -164,17 +164,17 @@ TAO_DynSequence_i::set_elements (const AnySeq& value, env.exception (new CORBA_DynAny::InvalidSeq); return; } - + CORBA::TypeCode_ptr element_type = this->get_element_type (env); for (CORBA::ULong i = 0; i < length; i++) { // Check each arg element for type match. - if (value[i].type ()->equal (element_type, + if (value[i].type ()->equal (element_type, env)) - this->da_members_[i] = - TAO_DynAny_i::create_dyn_any (value[i], + this->da_members_[i] = + TAO_DynAny_i::create_dyn_any (value[i], env); else @@ -189,13 +189,13 @@ TAO_DynSequence_i::set_elements (const AnySeq& value, // Common functions void -TAO_DynSequence_i::assign (CORBA_DynAny_ptr dyn_any, +TAO_DynSequence_i::assign (CORBA_DynAny_ptr dyn_any, CORBA::Environment &env) { // *dyn_any->to_any raises Invalid if arg is bad. - if (this->type_.in ()->equal (dyn_any->type (env), + if (this->type_.in ()->equal (dyn_any->type (env), env)) - this->from_any (*dyn_any->to_any (env), + this->from_any (*dyn_any->to_any (env), env); else env.exception (new CORBA_DynAny::Invalid); @@ -205,7 +205,7 @@ CORBA_DynAny_ptr TAO_DynSequence_i::copy (CORBA::Environment &env) { CORBA_Any_ptr a = this->to_any (env); - return TAO_DynAny_i::create_dyn_any (*a, + return TAO_DynAny_i::create_dyn_any (*a, env); } @@ -221,10 +221,10 @@ TAO_DynSequence_i::destroy (CORBA::Environment &env) } void -TAO_DynSequence_i::from_any (const CORBA_Any& any, +TAO_DynSequence_i::from_any (const CORBA_Any& any, CORBA::Environment &env) { - if (this->type_.in ()->equal (any.type (), + if (this->type_.in ()->equal (any.type (), env)) { // Get the CDR stream of the argument. @@ -233,7 +233,7 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any, TAO_InputCDR cdr (mb); CORBA::ULong arg_length; - + // If the any is a sequence, first 4 bytes of cdr hold the length. cdr.read_ulong (arg_length); @@ -247,7 +247,7 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any, env.exception (new CORBA_DynAny::Invalid); return; } - + CORBA::TypeCode_ptr field_tc = this->get_element_type (env); for (CORBA::ULong i = 0; i < arg_length; i++) @@ -255,11 +255,11 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any, // This Any constructor is a TAO extension. CORBA_Any field_any (field_tc, cdr.start ()); - + // Actually a recursive step. Can't call from_any() // recursively because maybe only the top level is created, // but create_dyn_any will do the right thing. - this->da_members_[i] = + this->da_members_[i] = TAO_DynAny_i::create_dyn_any (field_any, env); @@ -292,18 +292,18 @@ TAO_DynSequence_i::to_any (CORBA::Environment& _env) // Recursive step CORBA_Any_ptr field_any = this->da_members_[i]->to_any (_env); - ACE_Message_Block* field_mb = + ACE_Message_Block* field_mb = ACE_Message_Block::duplicate (field_any->_tao_get_cdr ()); TAO_InputCDR field_cdr (field_mb); - out_cdr.append (field_tc, - &field_cdr, + out_cdr.append (field_tc, + &field_cdr, _env); } TAO_InputCDR in_cdr (out_cdr); - + CORBA_Any* retval; ACE_NEW_THROW_RETURN (retval, CORBA_Any (this->type (_env), @@ -328,8 +328,8 @@ TAO_DynSequence_i::current_component (CORBA::Environment &env) return 0; if (!this->da_members_[this->index_].in ()) - this->da_members_[this->index_] = - TAO_DynAny_i::create_dyn_any (this->get_element_type (env), + this->da_members_[this->index_] = + TAO_DynAny_i::create_dyn_any (this->get_element_type (env), env); return this->da_members_[this->index_].in (); @@ -348,7 +348,7 @@ TAO_DynSequence_i::next (CORBA::Environment &) } CORBA::Boolean -TAO_DynSequence_i::seek (CORBA::Long index, +TAO_DynSequence_i::seek (CORBA::Long index, CORBA::Environment &) { if (index < 0 || index >= (CORBA::Long) this->da_members_.size ()) @@ -365,7 +365,7 @@ TAO_DynSequence_i::rewind (CORBA::Environment &) } /////////////////////////////////////////////////////////////////////// -// The insert-primitive and get-primitive functions are required +// The insert-primitive and get-primitive functions are required // by the spec of all types of DynAny, although if the top level // members aren't primitive types, these functions aren't too helpful. // Also, while not mentioned in the spec, the example code seems to @@ -376,12 +376,12 @@ TAO_DynSequence_i::rewind (CORBA::Environment &) // Insert functions void -TAO_DynSequence_i::insert_boolean (CORBA::Boolean value, +TAO_DynSequence_i::insert_boolean (CORBA::Boolean value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_boolean) { - this->current_component (env)->insert_boolean (value, + this->current_component (env)->insert_boolean (value, env); this->next (env); } @@ -390,7 +390,7 @@ TAO_DynSequence_i::insert_boolean (CORBA::Boolean value, } void -TAO_DynSequence_i::insert_octet (CORBA::Octet value, +TAO_DynSequence_i::insert_octet (CORBA::Octet value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_octet) @@ -404,7 +404,7 @@ TAO_DynSequence_i::insert_octet (CORBA::Octet value, } void -TAO_DynSequence_i::insert_char (CORBA::Char value, +TAO_DynSequence_i::insert_char (CORBA::Char value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_char) @@ -418,7 +418,7 @@ TAO_DynSequence_i::insert_char (CORBA::Char value, } void -TAO_DynSequence_i::insert_short (CORBA::Short value, +TAO_DynSequence_i::insert_short (CORBA::Short value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_short) @@ -432,12 +432,12 @@ TAO_DynSequence_i::insert_short (CORBA::Short value, } void -TAO_DynSequence_i::insert_ushort (CORBA::UShort value, +TAO_DynSequence_i::insert_ushort (CORBA::UShort value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_ushort) { - this->current_component (env)->insert_ushort (value, + this->current_component (env)->insert_ushort (value, env); this->next (env); } @@ -446,12 +446,12 @@ TAO_DynSequence_i::insert_ushort (CORBA::UShort value, } void -TAO_DynSequence_i::insert_long (CORBA::Long value, +TAO_DynSequence_i::insert_long (CORBA::Long value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_long) { - this->current_component (env)->insert_long (value, + this->current_component (env)->insert_long (value, env); this->next (env); } @@ -460,12 +460,12 @@ TAO_DynSequence_i::insert_long (CORBA::Long value, } void -TAO_DynSequence_i::insert_ulong (CORBA::ULong value, +TAO_DynSequence_i::insert_ulong (CORBA::ULong value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_long) { - this->current_component (env)->insert_ulong (value, + this->current_component (env)->insert_ulong (value, env); this->next (env); } @@ -474,12 +474,12 @@ TAO_DynSequence_i::insert_ulong (CORBA::ULong value, } void -TAO_DynSequence_i::insert_float (CORBA::Float value, +TAO_DynSequence_i::insert_float (CORBA::Float value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_float) { - this->current_component (env)->insert_float (value, + this->current_component (env)->insert_float (value, env); this->next (env); } @@ -488,12 +488,12 @@ TAO_DynSequence_i::insert_float (CORBA::Float value, } void -TAO_DynSequence_i::insert_double (CORBA::Double value, +TAO_DynSequence_i::insert_double (CORBA::Double value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_double) { - this->current_component (env)->insert_double (value, + this->current_component (env)->insert_double (value, env); this->next (env); } @@ -502,12 +502,12 @@ TAO_DynSequence_i::insert_double (CORBA::Double value, } void -TAO_DynSequence_i::insert_string (const char * value, +TAO_DynSequence_i::insert_string (const char * value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_string) { - this->current_component (env)->insert_string (value, + this->current_component (env)->insert_string (value, env); this->next (env); } @@ -516,12 +516,12 @@ TAO_DynSequence_i::insert_string (const char * value, } void -TAO_DynSequence_i::insert_reference (CORBA::Object_ptr value, +TAO_DynSequence_i::insert_reference (CORBA::Object_ptr value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_objref) { - this->current_component (env)->insert_reference (value, + this->current_component (env)->insert_reference (value, env); this->next (env); } @@ -530,12 +530,12 @@ TAO_DynSequence_i::insert_reference (CORBA::Object_ptr value, } void -TAO_DynSequence_i::insert_typecode (CORBA::TypeCode_ptr value, +TAO_DynSequence_i::insert_typecode (CORBA::TypeCode_ptr value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_TypeCode) { - this->current_component (env)->insert_typecode (value, + this->current_component (env)->insert_typecode (value, env); this->next (env); } @@ -544,12 +544,12 @@ TAO_DynSequence_i::insert_typecode (CORBA::TypeCode_ptr value, } void -TAO_DynSequence_i::insert_longlong (CORBA::LongLong value, +TAO_DynSequence_i::insert_longlong (CORBA::LongLong value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_longlong) { - this->current_component (env)->insert_longlong (value, + this->current_component (env)->insert_longlong (value, env); this->next (env); } @@ -558,12 +558,12 @@ TAO_DynSequence_i::insert_longlong (CORBA::LongLong value, } void -TAO_DynSequence_i::insert_ulonglong (CORBA::ULongLong value, +TAO_DynSequence_i::insert_ulonglong (CORBA::ULongLong value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_ulonglong) { - this->current_component (env)->insert_ulonglong (value, + this->current_component (env)->insert_ulonglong (value, env); this->next (env); } @@ -572,12 +572,12 @@ TAO_DynSequence_i::insert_ulonglong (CORBA::ULongLong value, } void -TAO_DynSequence_i::insert_wchar (CORBA::WChar value, +TAO_DynSequence_i::insert_wchar (CORBA::WChar value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_wchar) { - this->current_component (env)->insert_wchar (value, + this->current_component (env)->insert_wchar (value, env); this->next (env); } @@ -586,12 +586,12 @@ TAO_DynSequence_i::insert_wchar (CORBA::WChar value, } void -TAO_DynSequence_i::insert_any (const CORBA::Any& value, +TAO_DynSequence_i::insert_any (const CORBA::Any& value, CORBA::Environment &env) { if (this->get_element_type (env)->kind (env) == CORBA::tk_any) { - this->current_component (env)->insert_any (value, + this->current_component (env)->insert_any (value, env); this->next (env); } @@ -603,7 +603,7 @@ TAO_DynSequence_i::insert_any (const CORBA::Any& value, // Get functions // If the current component has not been intialized, these -// raise Invalid, which is not required by the spec, but which +// raise Invalid, which is not required by the spec, but which // seems like a courteous thing to do. CORBA::Boolean @@ -624,7 +624,7 @@ TAO_DynSequence_i::get_boolean (CORBA::Environment &env) } else env.exception (new CORBA_DynAny::Invalid); - + return val; } @@ -873,7 +873,11 @@ TAO_DynSequence_i::get_typecode (CORBA::Environment &env) CORBA::LongLong TAO_DynSequence_i::get_longlong (CORBA::Environment &env) { +#if defined (ACE_LACKS_LONGLONG_T) + CORBA::LongLong val = {0, 0}; +#else /* ! ACE_LACKS_LONGLONG_T */ CORBA::LongLong val = 0; +#endif /* ! ACE_LACKS_LONGLONG_T */ CORBA_DynAny_ptr dp = this->da_members_[this->index_].in (); if (dp) diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp index 2b267de80d8..19a183ab9f4 100644 --- a/TAO/tao/DynStruct_i.cpp +++ b/TAO/tao/DynStruct_i.cpp @@ -26,9 +26,9 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any) { CORBA::Environment env; - // The type will be correct if this constructor called from a - // factory function, but it could also be called by the - // user, so..... + // The type will be correct if this constructor called from a + // factory function, but it could also be called by the + // user, so..... if (TAO_DynAny_i::unalias (this->type_.in (), env) == CORBA::tk_struct) { CORBA::ULong numfields = this->type_.in ()->member_count (env); @@ -44,17 +44,17 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any) for (CORBA::ULong i = 0; i < numfields; i++) { - CORBA::TypeCode_ptr field_tc = - this->type_.in ()->member_type (i, + CORBA::TypeCode_ptr field_tc = + this->type_.in ()->member_type (i, env); // This Any constructor is a TAO extension. CORBA_Any field_any (field_tc, cdr.start ()); - - // This recursive step will call the correct constructor + + // This recursive step will call the correct constructor // based on the type of field_any. - this->da_members_[i] = + this->da_members_[i] = TAO_DynAny_i::create_dyn_any (field_any, env); @@ -87,7 +87,7 @@ TAO_DynStruct_i::TAO_DynStruct_i (CORBA_TypeCode_ptr tc) this->da_members_[i] = 0; } else - env.exception (new CORBA_ORB_InconsistentTypeCode); + env.exception (new CORBA_ORB_InconsistentTypeCode); } TAO_DynStruct_i::~TAO_DynStruct_i (void) @@ -107,12 +107,12 @@ TAO_DynStruct_i::current_member_name (CORBA::Environment& env) CORBA::TCKind TAO_DynStruct_i::current_member_kind (CORBA::Environment& env) { - return TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_, - env), + return TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_, + env), env); } -NameValuePairSeq* +NameValuePairSeq* TAO_DynStruct_i::get_members (CORBA::Environment& _env) { CORBA::ULong length = this->da_members_.size (); @@ -129,7 +129,7 @@ TAO_DynStruct_i::get_members (CORBA::Environment& _env) // Assign name and value to each pearl on the string. for (CORBA::ULong i = 0; i < length; i++) { - (*members)[i].id = + (*members)[i].id = CORBA::string_dup (this->type_.in ()->member_name (i)); (*members)[i].value = *this->da_members_[i]->to_any (_env); } @@ -137,7 +137,7 @@ TAO_DynStruct_i::get_members (CORBA::Environment& _env) return members; } -void +void TAO_DynStruct_i::set_members (const NameValuePairSeq& value, CORBA::Environment& env) { @@ -149,13 +149,13 @@ TAO_DynStruct_i::set_members (const NameValuePairSeq& value, for (CORBA::ULong i = 0; i < length; i++) { // Check for type and name match. - if (value[i].value.type ()->equal (this->type_.in ()->member_type (i, + if (value[i].value.type ()->equal (this->type_.in ()->member_type (i, env)) - && !ACE_OS::strcmp (value[i].id, + && !ACE_OS::strcmp (value[i].id, this->type_.in ()->member_name (i))) - this->da_members_[i] = - TAO_DynAny_i::create_dyn_any (value[i].value, + this->da_members_[i] = + TAO_DynAny_i::create_dyn_any (value[i].value, env); else @@ -173,13 +173,13 @@ TAO_DynStruct_i::set_members (const NameValuePairSeq& value, // Common functions void -TAO_DynStruct_i::assign (CORBA_DynAny_ptr dyn_any, +TAO_DynStruct_i::assign (CORBA_DynAny_ptr dyn_any, CORBA::Environment &env) { // *dyn_any->to_any raises Invalid if arg is bad. - if (this->type_.in ()->equal (dyn_any->type (env), + if (this->type_.in ()->equal (dyn_any->type (env), env)) - this->from_any (*dyn_any->to_any (env), + this->from_any (*dyn_any->to_any (env), env); else env.exception (new CORBA_DynAny::Invalid); @@ -189,7 +189,7 @@ CORBA_DynAny_ptr TAO_DynStruct_i::copy (CORBA::Environment &env) { CORBA_Any_ptr a = this->to_any (env); - return TAO_DynAny_i::create_dyn_any (*a, + return TAO_DynAny_i::create_dyn_any (*a, env); } @@ -205,10 +205,10 @@ TAO_DynStruct_i::destroy (CORBA::Environment &env) } void -TAO_DynStruct_i::from_any (const CORBA_Any& any, +TAO_DynStruct_i::from_any (const CORBA_Any& any, CORBA::Environment &env) { - if (this->type_.in ()->equal (any.type (), + if (this->type_.in ()->equal (any.type (), env)) { // Get the CDR stream of the argument. @@ -218,18 +218,18 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any, for (CORBA::ULong i = 0; i < this->da_members_.size (); i++) { - CORBA::TypeCode_ptr field_tc = - this->type_.in ()->member_type (i, + CORBA::TypeCode_ptr field_tc = + this->type_.in ()->member_type (i, env); // This Any constructor is a TAO extension. CORBA_Any field_any (field_tc, cdr.start ()); - + // Actually a recursive step. Can't call from_any() // recursively because maybe only the top level is created, // but create_dyn_any will do the right thing. - this->da_members_[i] = + this->da_members_[i] = TAO_DynAny_i::create_dyn_any (field_any, env); @@ -260,18 +260,18 @@ TAO_DynStruct_i::to_any (CORBA::Environment& env) // Recursive step CORBA_Any_ptr field_any = this->da_members_[i]->to_any (env); - ACE_Message_Block* field_mb = + ACE_Message_Block* field_mb = ACE_Message_Block::duplicate (field_any->_tao_get_cdr ()); TAO_InputCDR field_cdr (field_mb); - out_cdr.append (field_tc, - &field_cdr, + out_cdr.append (field_tc, + &field_cdr, env); } TAO_InputCDR in_cdr (out_cdr); - + return new CORBA_Any (this->type (env), in_cdr.start ()); } @@ -288,10 +288,10 @@ CORBA_DynAny_ptr TAO_DynStruct_i::current_component (CORBA::Environment &env) { if (!this->da_members_[this->index_].in ()) - this->da_members_[this->index_] = + this->da_members_[this->index_] = TAO_DynAny_i::create_dyn_any ( - this->type_.in ()->member_type (this->index_, - env), + this->type_.in ()->member_type (this->index_, + env), env ); @@ -309,7 +309,7 @@ TAO_DynStruct_i::next (CORBA::Environment &) } CORBA::Boolean -TAO_DynStruct_i::seek (CORBA::Long index, +TAO_DynStruct_i::seek (CORBA::Long index, CORBA::Environment &) { if (index < 0 || index >= (CORBA::Long) this->da_members_.size ()) @@ -326,7 +326,7 @@ TAO_DynStruct_i::rewind (CORBA::Environment &) } ////////////////////////////////////////////////////////////////////////// -// The insert-primitive and get-primitive functions are required +// The insert-primitive and get-primitive functions are required // by the spec of all types of DynAny, although if the top level // members aren't primitive types, these functions aren't too helpful. // Also, while not mentioned in the spec, the example code seems to @@ -337,14 +337,14 @@ TAO_DynStruct_i::rewind (CORBA::Environment &) // Insert functions void -TAO_DynStruct_i::insert_boolean (CORBA::Boolean value, +TAO_DynStruct_i::insert_boolean (CORBA::Boolean value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_boolean) { - this->current_component (env)->insert_boolean (value, + this->current_component (env)->insert_boolean (value, env); this->next (env); } @@ -353,14 +353,14 @@ TAO_DynStruct_i::insert_boolean (CORBA::Boolean value, } void -TAO_DynStruct_i::insert_octet (CORBA::Octet value, +TAO_DynStruct_i::insert_octet (CORBA::Octet value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), env) == CORBA::tk_octet) { - this->current_component (env)->insert_octet (value, + this->current_component (env)->insert_octet (value, env); this->next (env); } @@ -369,14 +369,14 @@ TAO_DynStruct_i::insert_octet (CORBA::Octet value, } void -TAO_DynStruct_i::insert_char (CORBA::Char value, +TAO_DynStruct_i::insert_char (CORBA::Char value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_char) { - this->current_component (env)->insert_char (value, + this->current_component (env)->insert_char (value, env); this->next (env); } @@ -385,14 +385,14 @@ TAO_DynStruct_i::insert_char (CORBA::Char value, } void -TAO_DynStruct_i::insert_short (CORBA::Short value, +TAO_DynStruct_i::insert_short (CORBA::Short value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_short) { - this->current_component (env)->insert_short (value, + this->current_component (env)->insert_short (value, env); this->next (env); } @@ -401,14 +401,14 @@ TAO_DynStruct_i::insert_short (CORBA::Short value, } void -TAO_DynStruct_i::insert_ushort (CORBA::UShort value, +TAO_DynStruct_i::insert_ushort (CORBA::UShort value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_ushort) { - this->current_component (env)->insert_ushort (value, + this->current_component (env)->insert_ushort (value, env); this->next (env); } @@ -417,14 +417,14 @@ TAO_DynStruct_i::insert_ushort (CORBA::UShort value, } void -TAO_DynStruct_i::insert_long (CORBA::Long value, +TAO_DynStruct_i::insert_long (CORBA::Long value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_long) { - this->current_component (env)->insert_long (value, + this->current_component (env)->insert_long (value, env); this->next (env); } @@ -433,14 +433,14 @@ TAO_DynStruct_i::insert_long (CORBA::Long value, } void -TAO_DynStruct_i::insert_ulong (CORBA::ULong value, +TAO_DynStruct_i::insert_ulong (CORBA::ULong value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_long) { - this->current_component (env)->insert_ulong (value, + this->current_component (env)->insert_ulong (value, env); this->next (env); } @@ -449,14 +449,14 @@ TAO_DynStruct_i::insert_ulong (CORBA::ULong value, } void -TAO_DynStruct_i::insert_float (CORBA::Float value, +TAO_DynStruct_i::insert_float (CORBA::Float value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_float) { - this->current_component (env)->insert_float (value, + this->current_component (env)->insert_float (value, env); this->next (env); } @@ -465,14 +465,14 @@ TAO_DynStruct_i::insert_float (CORBA::Float value, } void -TAO_DynStruct_i::insert_double (CORBA::Double value, +TAO_DynStruct_i::insert_double (CORBA::Double value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_double) { - this->current_component (env)->insert_double (value, + this->current_component (env)->insert_double (value, env); this->next (env); } @@ -481,14 +481,14 @@ TAO_DynStruct_i::insert_double (CORBA::Double value, } void -TAO_DynStruct_i::insert_string (const char * value, +TAO_DynStruct_i::insert_string (const char * value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_string) { - this->current_component (env)->insert_string (value, + this->current_component (env)->insert_string (value, env); this->next (env); } @@ -497,14 +497,14 @@ TAO_DynStruct_i::insert_string (const char * value, } void -TAO_DynStruct_i::insert_reference (CORBA::Object_ptr value, +TAO_DynStruct_i::insert_reference (CORBA::Object_ptr value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_objref) { - this->current_component (env)->insert_reference (value, + this->current_component (env)->insert_reference (value, env); this->next (env); } @@ -513,14 +513,14 @@ TAO_DynStruct_i::insert_reference (CORBA::Object_ptr value, } void -TAO_DynStruct_i::insert_typecode (CORBA::TypeCode_ptr value, +TAO_DynStruct_i::insert_typecode (CORBA::TypeCode_ptr value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_TypeCode) { - this->current_component (env)->insert_typecode (value, + this->current_component (env)->insert_typecode (value, env); this->next (env); } @@ -529,14 +529,14 @@ TAO_DynStruct_i::insert_typecode (CORBA::TypeCode_ptr value, } void -TAO_DynStruct_i::insert_longlong (CORBA::LongLong value, +TAO_DynStruct_i::insert_longlong (CORBA::LongLong value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_longlong) { - this->current_component (env)->insert_longlong (value, + this->current_component (env)->insert_longlong (value, env); this->next (env); } @@ -545,14 +545,14 @@ TAO_DynStruct_i::insert_longlong (CORBA::LongLong value, } void -TAO_DynStruct_i::insert_ulonglong (CORBA::ULongLong value, +TAO_DynStruct_i::insert_ulonglong (CORBA::ULongLong value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_ulonglong) { - this->current_component (env)->insert_ulonglong (value, + this->current_component (env)->insert_ulonglong (value, env); this->next (env); } @@ -561,14 +561,14 @@ TAO_DynStruct_i::insert_ulonglong (CORBA::ULongLong value, } void -TAO_DynStruct_i::insert_wchar (CORBA::WChar value, +TAO_DynStruct_i::insert_wchar (CORBA::WChar value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_wchar) { - this->current_component (env)->insert_wchar (value, + this->current_component (env)->insert_wchar (value, env); this->next (env); } @@ -577,14 +577,14 @@ TAO_DynStruct_i::insert_wchar (CORBA::WChar value, } void -TAO_DynStruct_i::insert_any (const CORBA::Any& value, +TAO_DynStruct_i::insert_any (const CORBA::Any& value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), - env) + if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_), + env) == CORBA::tk_any) { - this->current_component (env)->insert_any (value, + this->current_component (env)->insert_any (value, env); this->next (env); } @@ -596,7 +596,7 @@ TAO_DynStruct_i::insert_any (const CORBA::Any& value, // Get functions // If the current component has not been intialized, these -// raise Invalid, which is not required by the spec, but which +// raise Invalid, which is not required by the spec, but which // seems like a courteous thing to do. CORBA::Boolean @@ -607,8 +607,8 @@ TAO_DynStruct_i::get_boolean (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_boolean) { val = dp->get_boolean (env); @@ -619,7 +619,7 @@ TAO_DynStruct_i::get_boolean (CORBA::Environment &env) } else env.exception (new CORBA_DynAny::Invalid); - + return val; } @@ -631,8 +631,8 @@ TAO_DynStruct_i::get_octet (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_octet) { val = dp->get_octet (env); @@ -655,8 +655,8 @@ TAO_DynStruct_i::get_char (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_char) { val = dp->get_char (env); @@ -679,8 +679,8 @@ TAO_DynStruct_i::get_short (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_short) { val = dp->get_short (env); @@ -703,8 +703,8 @@ TAO_DynStruct_i::get_ushort (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_ushort) { val = dp->get_ushort (env); @@ -727,8 +727,8 @@ TAO_DynStruct_i::get_long (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_long) { val = dp->get_long (env); @@ -751,8 +751,8 @@ TAO_DynStruct_i::get_ulong (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_ulong) { val = dp->get_ulong (env); @@ -775,8 +775,8 @@ TAO_DynStruct_i::get_float (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_float) { val = dp->get_float (env); @@ -799,8 +799,8 @@ TAO_DynStruct_i::get_double (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_double) { val = dp->get_double (env); @@ -823,8 +823,8 @@ TAO_DynStruct_i::get_string (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_string) { val = dp->get_string (env); @@ -847,8 +847,8 @@ TAO_DynStruct_i::get_reference (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_objref) { val = dp->get_reference (env); @@ -871,8 +871,8 @@ TAO_DynStruct_i::get_typecode (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_TypeCode) { val = dp->get_typecode (env); @@ -890,13 +890,17 @@ TAO_DynStruct_i::get_typecode (CORBA::Environment &env) CORBA::LongLong TAO_DynStruct_i::get_longlong (CORBA::Environment &env) { +#if defined (ACE_LACKS_LONGLONG_T) + CORBA::LongLong val = {0, 0}; +#else /* ! ACE_LACKS_LONGLONG_T */ CORBA::LongLong val = 0; +#endif /* ! ACE_LACKS_LONGLONG_T */ CORBA_DynAny_ptr dp = this->da_members_[this->index_].in (); if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_longlong) { val = dp->get_longlong (env); @@ -919,8 +923,8 @@ TAO_DynStruct_i::get_ulonglong (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_ulonglong) { val = dp->get_ulonglong (env); @@ -943,8 +947,8 @@ TAO_DynStruct_i::get_wchar (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_wchar) { val = dp->get_wchar (env); @@ -967,8 +971,8 @@ TAO_DynStruct_i::get_any (CORBA::Environment &env) if (dp) { - if (TAO_DynAny_i::unalias (dp->type (env), - env) + if (TAO_DynAny_i::unalias (dp->type (env), + env) == CORBA::tk_any) { val = dp->get_any (env); diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index 75796a26b60..cc29391af7c 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -23,8 +23,8 @@ TAO_DynUnion_i::TAO_DynUnion_i (const CORBA_Any& any) { CORBA::Environment env; - if (TAO_DynAny_i::unalias (any.type (), - env) + if (TAO_DynAny_i::unalias (any.type (), + env) == CORBA::tk_union) { // Initialize the typecode holder @@ -40,8 +40,8 @@ TAO_DynUnion_i::TAO_DynUnion_i (CORBA_TypeCode_ptr tc) { CORBA::Environment env; - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_union) { // Initialize the typecode holder @@ -50,7 +50,7 @@ TAO_DynUnion_i::TAO_DynUnion_i (CORBA_TypeCode_ptr tc) CORBA::TypeCode_ptr disc_tc = tc->discriminator_type (env); // Get a typecode into the discriminator holder. - this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_tc, + this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_tc, env); // To be filled in by from_any() or assign(). @@ -70,7 +70,7 @@ TAO_DynUnion_i::~TAO_DynUnion_i (void) // If an invalid value has been passed in to the discriminator, // we don't save it but instead set the member index to the // default value, if one exists. -CORBA::Boolean +CORBA::Boolean TAO_DynUnion_i::set_as_default (CORBA::Environment& env) { if ((CORBA::Long) this->index_ == this->type_->default_index (env)) @@ -89,35 +89,35 @@ TAO_DynUnion_i::set_as_default (CORBA::Boolean set_as_default, // we override it as a no-op. } -CORBA_DynAny_ptr +CORBA_DynAny_ptr TAO_DynUnion_i::discriminator (CORBA::Environment&) { return this->discriminator_.in (); } -CORBA::TCKind +CORBA::TCKind TAO_DynUnion_i::discriminator_kind (CORBA::Environment& env) { - return TAO_DynAny_i::unalias (this->type_->discriminator_type (env), + return TAO_DynAny_i::unalias (this->type_->discriminator_type (env), env); } -CORBA_DynAny_ptr +CORBA_DynAny_ptr TAO_DynUnion_i::member (CORBA::Environment& env) { return this->member_.in (); } -char* +char* TAO_DynUnion_i::member_name (CORBA::Environment& env) { - return CORBA::string_dup (this->type_->member_name (this->index_, + return CORBA::string_dup (this->type_->member_name (this->index_, env)); } // If a valid member name is supplied, this function creates a new // member which is NOT initialized. -void +void TAO_DynUnion_i::member_name (const char* member_name, CORBA::Environment& env) { @@ -125,8 +125,8 @@ TAO_DynUnion_i::member_name (const char* member_name, for (CORBA::ULong i = 0; i < count; i++) { - if (!ACE_OS::strcmp (member_name, - this->type_->member_name (i, + if (!ACE_OS::strcmp (member_name, + this->type_->member_name (i, env))) { // No sense doing anything if we're just "resetting" to the @@ -135,13 +135,13 @@ TAO_DynUnion_i::member_name (const char* member_name, return; else { - this->member_ = - TAO_DynAny_i::create_dyn_any (this->type_->member_type (i, + this->member_ = + TAO_DynAny_i::create_dyn_any (this->type_->member_type (i, env), env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; @@ -151,11 +151,11 @@ TAO_DynUnion_i::member_name (const char* member_name, } -CORBA::TCKind +CORBA::TCKind TAO_DynUnion_i::member_kind (CORBA::Environment& env) { - return TAO_DynAny_i::unalias (this->type_->member_type (this->index_, - env), + return TAO_DynAny_i::unalias (this->type_->member_type (this->index_, + env), env); } @@ -163,13 +163,13 @@ TAO_DynUnion_i::member_kind (CORBA::Environment& env) // Common functions void -TAO_DynUnion_i::assign (CORBA_DynAny_ptr dyn_any, +TAO_DynUnion_i::assign (CORBA_DynAny_ptr dyn_any, CORBA::Environment &env) { // *dyn_any->to_any raises Invalid if arg is bad. - if (this->type_->equal (dyn_any->type (env), + if (this->type_->equal (dyn_any->type (env), env)) - this->from_any (*dyn_any->to_any (env), + this->from_any (*dyn_any->to_any (env), env); else env.exception (new CORBA_DynAny::Invalid); @@ -179,7 +179,7 @@ CORBA_DynAny_ptr TAO_DynUnion_i::copy (CORBA::Environment &env) { CORBA_Any_ptr a = this->to_any (env); - return TAO_DynAny_i::create_dyn_any (*a, + return TAO_DynAny_i::create_dyn_any (*a, env); } @@ -198,9 +198,9 @@ void TAO_DynUnion_i::from_any (const CORBA_Any& any, CORBA::Environment &env) { - if (this->type_.in ()->equal (any.type (), + if (this->type_.in ()->equal (any.type (), env)) - this->set_from_any (any, + this->set_from_any (any, env); else env.exception (new CORBA_DynAny::Invalid); @@ -224,12 +224,12 @@ TAO_DynUnion_i::to_any (CORBA::Environment& _env) CORBA_Any_ptr disc_any = this->discriminator_->to_any (_env); - ACE_Message_Block* disc_mb = + ACE_Message_Block* disc_mb = ACE_Message_Block::duplicate (disc_any->_tao_get_cdr ()); TAO_InputCDR disc_cdr (disc_mb); - out_cdr.append (disc_tc, + out_cdr.append (disc_tc, &disc_cdr, _env); @@ -244,8 +244,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& _env) TAO_InputCDR member_cdr (member_mb); - out_cdr.append (member_tc, - &member_cdr, + out_cdr.append (member_tc, + &member_cdr, _env); // Make the Any. @@ -280,15 +280,15 @@ TAO_DynUnion_i::next (CORBA::Environment &env) ++this->index_; - this->member_ = - TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_, + this->member_ = + TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_, env), env); return 1; } CORBA::Boolean -TAO_DynUnion_i::seek (CORBA::Long index, +TAO_DynUnion_i::seek (CORBA::Long index, CORBA::Environment &env) { if (index < 0 || index >= (CORBA::Long) this->type_->member_count (env)) @@ -296,8 +296,8 @@ TAO_DynUnion_i::seek (CORBA::Long index, this->index_ = index; - this->member_ = - TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_, + this->member_ = + TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_, env), env); return 1; @@ -311,11 +311,11 @@ TAO_DynUnion_i::rewind (CORBA::Environment &env) this->index_ = 0; - this->member_ = - TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_, + this->member_ = + TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_, env), env); -} +} ///////////////////////////////////////////////////////////////////////////// // Insert and get functions @@ -328,13 +328,13 @@ TAO_DynUnion_i::rewind (CORBA::Environment &env) // Insert functions void -TAO_DynUnion_i::insert_boolean (CORBA::Boolean value, +TAO_DynUnion_i::insert_boolean (CORBA::Boolean value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_boolean) - this->member_->insert_boolean (value, + this->member_->insert_boolean (value, env); else { @@ -342,38 +342,38 @@ TAO_DynUnion_i::insert_boolean (CORBA::Boolean value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_boolean) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_boolean (value, + this->member_->insert_boolean (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_octet (CORBA::Octet value, +TAO_DynUnion_i::insert_octet (CORBA::Octet value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_octet) - this->member_->insert_octet (value, + this->member_->insert_octet (value, env); else { @@ -381,38 +381,38 @@ TAO_DynUnion_i::insert_octet (CORBA::Octet value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_octet) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_octet (value, + this->member_->insert_octet (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_char (CORBA::Char value, +TAO_DynUnion_i::insert_char (CORBA::Char value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_char) - this->member_->insert_char (value, + this->member_->insert_char (value, env); else { @@ -420,36 +420,36 @@ TAO_DynUnion_i::insert_char (CORBA::Char value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_char) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_char (value, + this->member_->insert_char (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_short (CORBA::Short value, +TAO_DynUnion_i::insert_short (CORBA::Short value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_short) this->member_->insert_short (value, env); else @@ -458,38 +458,38 @@ TAO_DynUnion_i::insert_short (CORBA::Short value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_short) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_short (value, + this->member_->insert_short (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_long (CORBA::Long value, +TAO_DynUnion_i::insert_long (CORBA::Long value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_long) - this->member_->insert_long (value, + this->member_->insert_long (value, env); else { @@ -497,38 +497,38 @@ TAO_DynUnion_i::insert_long (CORBA::Long value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_long) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_long (value, + this->member_->insert_long (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_ushort (CORBA::UShort value, +TAO_DynUnion_i::insert_ushort (CORBA::UShort value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_ushort) - this->member_->insert_ushort (value, + this->member_->insert_ushort (value, env); else { @@ -536,38 +536,38 @@ TAO_DynUnion_i::insert_ushort (CORBA::UShort value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_ushort) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_ushort (value, + this->member_->insert_ushort (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_ulong (CORBA::ULong value, +TAO_DynUnion_i::insert_ulong (CORBA::ULong value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_ulong) - this->member_->insert_ulong (value, + this->member_->insert_ulong (value, env); else { @@ -575,38 +575,38 @@ TAO_DynUnion_i::insert_ulong (CORBA::ULong value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_ulong) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_ulong (value, + this->member_->insert_ulong (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_float (CORBA::Float value, +TAO_DynUnion_i::insert_float (CORBA::Float value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_float) - this->member_->insert_float (value, + this->member_->insert_float (value, env); else { @@ -614,38 +614,38 @@ TAO_DynUnion_i::insert_float (CORBA::Float value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_float) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_float (value, + this->member_->insert_float (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_double (CORBA::Double value, +TAO_DynUnion_i::insert_double (CORBA::Double value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_double) - this->member_->insert_double (value, + this->member_->insert_double (value, env); else { @@ -653,38 +653,38 @@ TAO_DynUnion_i::insert_double (CORBA::Double value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_double) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_double (value, + this->member_->insert_double (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_string (const char* value, +TAO_DynUnion_i::insert_string (const char* value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_string) - this->member_->insert_string (value, + this->member_->insert_string (value, env); else { @@ -692,38 +692,38 @@ TAO_DynUnion_i::insert_string (const char* value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_string) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_string (value, + this->member_->insert_string (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value, +TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_objref) - this->member_->insert_reference (value, + this->member_->insert_reference (value, env); else { @@ -731,38 +731,38 @@ TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_objref) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_reference (value, + this->member_->insert_reference (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value, +TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_TypeCode) - this->member_->insert_typecode (value, + this->member_->insert_typecode (value, env); else { @@ -770,38 +770,38 @@ TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_TypeCode) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_typecode (value, + this->member_->insert_typecode (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_longlong (CORBA::LongLong value, +TAO_DynUnion_i::insert_longlong (CORBA::LongLong value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_longlong) - this->member_->insert_longlong (value, + this->member_->insert_longlong (value, env); else { @@ -809,38 +809,38 @@ TAO_DynUnion_i::insert_longlong (CORBA::LongLong value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_longlong) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_longlong (value, + this->member_->insert_longlong (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value, +TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_ulonglong) - this->member_->insert_ulonglong (value, + this->member_->insert_ulonglong (value, env); else { @@ -848,38 +848,38 @@ TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_ulonglong) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_ulonglong (value, + this->member_->insert_ulonglong (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_wchar (CORBA::WChar value, +TAO_DynUnion_i::insert_wchar (CORBA::WChar value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_wchar) - this->member_->insert_wchar (value, + this->member_->insert_wchar (value, env); else { @@ -887,36 +887,36 @@ TAO_DynUnion_i::insert_wchar (CORBA::WChar value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_wchar) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_wchar (value, + this->member_->insert_wchar (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } } void -TAO_DynUnion_i::insert_any (const CORBA::Any& value, +TAO_DynUnion_i::insert_any (const CORBA::Any& value, CORBA::Environment &env) { - if (TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_any) this->member_->insert_any (value, env); else @@ -925,25 +925,25 @@ TAO_DynUnion_i::insert_any (const CORBA::Any& value, for (CORBA::ULong i = 0; i < count; i++) { - CORBA::TypeCode_ptr tc = this->type_->member_type (i, + CORBA::TypeCode_ptr tc = this->type_->member_type (i, env); - if (TAO_DynAny_i::unalias (tc, - env) + if (TAO_DynAny_i::unalias (tc, + env) == CORBA::tk_any) { - this->member_ = TAO_DynAny_i::create_dyn_any (tc, + this->member_ = TAO_DynAny_i::create_dyn_any (tc, env); - this->member_->insert_any (value, + this->member_->insert_any (value, env); - this->discriminator_ = - TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, - env), + this->discriminator_ = + TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i, + env), env); this->index_ = i; return; } - } + } env.exception (new CORBA_DynAny::InvalidValue); } @@ -955,8 +955,8 @@ TAO_DynUnion_i::insert_any (const CORBA::Any& value, CORBA::Boolean TAO_DynUnion_i::get_boolean (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_boolean) return this->member_->get_boolean (env); else @@ -969,8 +969,8 @@ TAO_DynUnion_i::get_boolean (CORBA::Environment &env) CORBA::Octet TAO_DynUnion_i::get_octet (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_octet) return this->member_->get_octet (env); else @@ -983,8 +983,8 @@ TAO_DynUnion_i::get_octet (CORBA::Environment &env) CORBA::Char TAO_DynUnion_i::get_char (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_char) return this->member_->get_char (env); else @@ -997,8 +997,8 @@ TAO_DynUnion_i::get_char (CORBA::Environment &env) CORBA::Short TAO_DynUnion_i::get_short (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_short) return this->member_->get_short (env); else @@ -1011,8 +1011,8 @@ TAO_DynUnion_i::get_short (CORBA::Environment &env) CORBA::Long TAO_DynUnion_i::get_long (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_long) return this->member_->get_long (env); else @@ -1025,8 +1025,8 @@ TAO_DynUnion_i::get_long (CORBA::Environment &env) CORBA::UShort TAO_DynUnion_i::get_ushort(CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_ushort) return this->member_->get_ushort (env); else @@ -1039,8 +1039,8 @@ TAO_DynUnion_i::get_ushort(CORBA::Environment &env) CORBA::ULong TAO_DynUnion_i::get_ulong (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_ulong) return this->member_->get_ulong (env); else @@ -1053,8 +1053,8 @@ TAO_DynUnion_i::get_ulong (CORBA::Environment &env) CORBA::Float TAO_DynUnion_i::get_float (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_float) return this->member_->get_float (env); else @@ -1067,8 +1067,8 @@ TAO_DynUnion_i::get_float (CORBA::Environment &env) CORBA::Double TAO_DynUnion_i::get_double (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_double) return this->member_->get_double (env); else @@ -1081,8 +1081,8 @@ TAO_DynUnion_i::get_double (CORBA::Environment &env) CORBA::String TAO_DynUnion_i::get_string (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_string) return this->member_->get_string (env); else @@ -1095,8 +1095,8 @@ TAO_DynUnion_i::get_string (CORBA::Environment &env) CORBA::TypeCode_ptr TAO_DynUnion_i::get_typecode (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_TypeCode) return this->member_->get_typecode (env); else @@ -1109,8 +1109,8 @@ TAO_DynUnion_i::get_typecode (CORBA::Environment &env) CORBA::Object_ptr TAO_DynUnion_i::get_reference (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_objref) return this->member_->get_reference (env); else @@ -1123,22 +1123,28 @@ TAO_DynUnion_i::get_reference (CORBA::Environment &env) CORBA::LongLong TAO_DynUnion_i::get_longlong (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_longlong) return this->member_->get_longlong (env); else { env.exception (new CORBA_DynAny::Invalid); + +#if defined (ACE_LACKS_LONGLONG_T) + CORBA::LongLong tmp = {0, 0}; + return tmp; +#else /* ! ACE_LACKS_LONGLONG_T */ return 0; +#endif /* ! ACE_LACKS_LONGLONG_T */ } } CORBA::ULongLong TAO_DynUnion_i::get_ulonglong (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_ulonglong) return this->member_->get_ulonglong (env); else @@ -1151,8 +1157,8 @@ TAO_DynUnion_i::get_ulonglong (CORBA::Environment &env) CORBA::WChar TAO_DynUnion_i::get_wchar (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_wchar) return this->member_->get_wchar (env); else @@ -1165,8 +1171,8 @@ TAO_DynUnion_i::get_wchar (CORBA::Environment &env) CORBA::Any_ptr TAO_DynUnion_i::get_any (CORBA::Environment &env) { - if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), - env) + if (this->member_.in () && TAO_DynAny_i::unalias (this->member_->type (env), + env) == CORBA::tk_any) return this->member_->get_any (env); else @@ -1317,7 +1323,7 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, // This code is common to from_any and the constructor taking an Any // argument. -void +void TAO_DynUnion_i::set_from_any (const CORBA_Any& any, CORBA::Environment &env) { @@ -1333,7 +1339,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any, cdr.start ()); // Set the discriminator holder. - this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_any, + this->discriminator_ = TAO_DynAny_i::create_dyn_any (disc_any, env); cdr.skip (disc_tc); @@ -1344,19 +1350,19 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any, CORBA::TCKind discriminator_kind = disc_tc->kind (env); - ::DU_Extractor_base* functor = + ::DU_Extractor_base* functor = this->get_extractor (discriminator_kind, env); // Get the index. for (i = 0; i < count; i++) { - CORBA_Any label_any = *any.type ()->member_label (i, + CORBA_Any label_any = *any.type ()->member_label (i, env); CORBA::TCKind label_kind = label_any.type ()->kind (env); - // If there is a default index, note the value but don't call + // If there is a default index, note the value but don't call // check_match. if (label_kind == CORBA::tk_octet) { @@ -1381,7 +1387,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any, if (i == count && default_index != -1) this->index_ = default_index; - CORBA_Any member_any (any.type ()->member_type (this->index_, + CORBA_Any member_any (any.type ()->member_type (this->index_, env), cdr.start ()); diff --git a/TAO/tao/DynUnion_i_T.cpp b/TAO/tao/DynUnion_i_T.cpp index 0ccdbfdff71..1acc92fd2bb 100644 --- a/TAO/tao/DynUnion_i_T.cpp +++ b/TAO/tao/DynUnion_i_T.cpp @@ -18,7 +18,7 @@ #include "tao/DynUnion_i_T.h" -// Method of template class that serves as a functor for all that +// Method of template class that serves as a functor for all that // compares Anys constructed from all legal discriminator // types - some are specifically defined in DynUnion_i.cpp. @@ -29,7 +29,17 @@ DU_Extractor<Type>::check_match (const CORBA_Any& inside_any, { inside_any >>= this->member_index_; outside_any >>= this->arg_index_; + +#if defined (ACE_LACKS_LONGLONG_T) + // Oh, this is ugly. But, it's the only way I can think of + // to satisfy instantiations of CORBA::LongLong as well as + // all other (native) types. + return ! ACE_OS::memcmp (&this->member_index_, + &this->arg_index_, + sizeof (Type)); +#else /* ! ACE_LACKS_LONGLONG_T */ return this->member_index_ == this->arg_index_; +#endif /* ! ACE_LACKS_LONGLONG_T */ } #endif /* TAO_DYNUNION_I_T_C */ |