diff options
Diffstat (limited to 'config_complex_types_1/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp')
| -rw-r--r-- | config_complex_types_1/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/config_complex_types_1/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/config_complex_types_1/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp index 91cbe881f12..22041847890 100644 --- a/config_complex_types_1/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp +++ b/config_complex_types_1/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp @@ -46,12 +46,11 @@ namespace CIAO } DynamicAny::DynAny_ptr - DynAny_Handler::extract_into_dynany (const DataType& type, - const DataValue& value) + DynAny_Handler::extract_into_dynany (const Any &any) { DynamicAny::DynAny_var retval; - switch (type.kind ().integral ()) + switch (any.type ().kind ().integral ()) { // ========== BASIC TYPES case TCKind::tk_null_l: @@ -60,62 +59,62 @@ namespace CIAO case TCKind::tk_short_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_short); - retval->insert_short (CORBA::Short (static_cast < ::XMLSchema::short_ const & > (*value.begin_short ()))); + retval->insert_short (CORBA::Short (static_cast < ::XMLSchema::short_ const & > (any.value ().begin_short ()))); break; case TCKind::tk_long_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_long); - retval->insert_long (CORBA::Long (static_cast < ::XMLSchema::int_ const& > (*value.begin_long ()))); + retval->insert_long (CORBA::Long (static_cast < ::XMLSchema::int_ const& > (any.value ().begin_long ()))); break; case TCKind::tk_ushort_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ushort); - retval->insert_ushort (CORBA::UShort (static_cast< ::XMLSchema::unsignedShort const & > (*value.begin_ushort ()))); + retval->insert_ushort (CORBA::UShort (static_cast< ::XMLSchema::unsignedShort const & > (any.value ().begin_ushort ()))); break; case TCKind::tk_ulong_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ulong); - retval->insert_ulong (CORBA::ULong (static_cast < ::XMLSchema::unsignedInt const& > (*value.begin_ulong ()))); + retval->insert_ulong (CORBA::ULong (static_cast < ::XMLSchema::unsignedInt const& > (any.value ().begin_ulong ()))); break; case TCKind::tk_float_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_float); - retval->insert_float (CORBA::Float (*value.begin_float ())); + retval->insert_float (CORBA::Float (any.value ().begin_float ())); break; case TCKind::tk_double_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_double); - retval->insert_double (CORBA::Double (*value.begin_double ())); + retval->insert_double (CORBA::Double (any.value ().begin_double ())); break; case TCKind::tk_boolean_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_boolean); - retval->insert_boolean (static_cast < ::XMLSchema::boolean const& > (*value.begin_boolean ())); + retval->insert_boolean (static_cast < ::XMLSchema::boolean const& > (any.value ().begin_boolean ())); break; case TCKind::tk_char_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_char); - retval->insert_char (CORBA::Char (*value.begin_string ()->c_str ())); + retval->insert_char (CORBA::Char (any.value ().begin_string ()->c_str ())); break; case TCKind::tk_octet_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_octet); - retval->insert_octet (static_cast <const unsigned char &> (*value.begin_octet ())); + retval->insert_octet (static_cast <const unsigned char &> (any.value ().begin_octet ())); break; case TCKind::tk_string_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_string); - retval->insert_string (value.begin_string ()->c_str ()); + retval->insert_string (value->begin_string ()->c_str ()); break; case TCKind::tk_longlong_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_longlong); - retval->insert_longlong (CORBA::LongLong (static_cast < ::XMLSchema::long_ const& > (*value.begin_longlong ()))); + retval->insert_longlong (CORBA::LongLong (static_cast < ::XMLSchema::long_ const& > (any.value ().begin_longlong ()))); break; case TCKind::tk_ulonglong_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_ulonglong); - retval->insert_ulonglong (CORBA::ULongLong (static_cast < ::XMLSchema::unsignedLong const& > (*value.begin_ulonglong ()))); + retval->insert_ulonglong (CORBA::ULongLong (static_cast < ::XMLSchema::unsignedLong const& > (any.value ().begin_ulonglong ()))); break; case TCKind::tk_longdouble_l: @@ -123,7 +122,7 @@ namespace CIAO case TCKind::tk_wchar_l: retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_wchar); - retval->insert_wchar (CORBA::WChar (*value.begin_string ()->c_str ())); + retval->insert_wchar (CORBA::WChar (any.value ().begin_string ()->c_str ())); break; case TCKind::tk_wstring_l: @@ -131,7 +130,7 @@ namespace CIAO case TCKind::tk_enum_l: ACE_ERROR ((LM_ERROR, "Preparing to extract into enum\n")); - return DynEnum_Handler::extract_into_dynany (type, value); + return DynEnum_Handler::extract_into_dynany (type, *value); case TCKind::tk_wfixed_l: case TCKind::tk_any_l: |