diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-01 10:01:44 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-01 10:01:44 +0000 |
| commit | f51bc74c4314d829dfae266837813fe9818afe63 (patch) | |
| tree | 760063017a8b780046c81620a1e615eff1ff7c44 | |
| parent | 0aa2f8a2d9ff035bedced87bc6297e961fda0d7e (diff) | |
| download | ATCD-f51bc74c4314d829dfae266837813fe9818afe63.tar.gz | |
Thu Sep 1 09:59:22 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h:
* tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
* tao/AnyTypeCode_Adapter.h:
* tao/Basic_Arguments.h:
Added support for std::wstring
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h | 4 | ||||
| -rw-r--r-- | TAO/tao/AnyTypeCode_Adapter.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Basic_Arguments.h | 11 |
5 files changed, 35 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 09910ebf38d..97fd318a78e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 1 09:59:22 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h: + * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp: + * tao/AnyTypeCode_Adapter.h: + * tao/Basic_Arguments.h: + Added support for std::wstring + Thu Sep 1 06:31:53 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/BD_String_SArgument_T.cpp: diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 0fbb6b7ce1b..7b75c7130ed 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -98,6 +98,14 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const std::stri (*any) <<= value.c_str (); } +#if !defined(ACE_LACKS_STD_WSTRING) +void +TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const std::wstring & value) +{ + (*any) <<= value.c_str (); +} +#endif /* ACE_LACKS_STD_WSTRING */ + void TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Long value) { diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index aea65d5d859..dd68e76aeca 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -93,6 +93,10 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, const std::string & value); +#if !defined(ACE_LACKS_STD_WSTRING) + virtual void insert_into_any (CORBA::Any * any, const std::wstring & value); +#endif /* ACE_LACKS_STD_WSTRING */ + virtual void insert_into_any (CORBA::Any * any, CORBA::Long value); virtual void insert_into_any (CORBA::Any * any, CORBA::Short value); diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index a52ae043ef5..69e7ce0caa6 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -123,6 +123,10 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, const std::string & value) = 0; +#if !defined(ACE_LACKS_STD_WSTRING) + virtual void insert_into_any (CORBA::Any * any, const std::wstring & value) = 0; +#endif /* ACE_LACKS_STD_WSTRING */ + virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) = 0; virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy) = 0; diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h index 153c977dd90..5f92282dcd7 100644 --- a/TAO/tao/Basic_Arguments.h +++ b/TAO/tao/Basic_Arguments.h @@ -140,6 +140,17 @@ namespace TAO Any_Insert_Policy_AnyTypeCode_Adapter> { }; + +#if !defined(ACE_LACKS_STD_WSTRING) + template<> + class TAO_Export Arg_Traits<std::wstring> + : public + Basic_Arg_Traits_T < + std::wstring, + Any_Insert_Policy_AnyTypeCode_Adapter> + { + }; +#endif /* ACE_LACKS_STD_WSTRING */ } TAO_END_VERSIONED_NAMESPACE_DECL |