diff options
Diffstat (limited to 'tao')
38 files changed, 143 insertions, 149 deletions
diff --git a/tao/AnyTypeCode/Any.cpp b/tao/AnyTypeCode/Any.cpp index 279f45ff238..b3cc6a9e3b0 100644 --- a/tao/AnyTypeCode/Any.cpp +++ b/tao/AnyTypeCode/Any.cpp @@ -527,9 +527,23 @@ operator <<= (CORBA::Any &any, const std::string & str) void operator <<= (CORBA::Any &, std::string *) { - // TODO + // @todo } +#if !defined(ACE_LACKS_STD_WSTRING) +void +operator <<= (CORBA::Any &any, const std::wstring & str) +{ + any <<= str.c_str (); +} + +void +operator <<= (CORBA::Any &, std::wstring *) +{ + // @todo +} +#endif + // Extraction: these are safe and hence we have to check that the // typecode of the Any is equal to the one we are trying to extract // into. @@ -745,6 +759,18 @@ operator >>= (const CORBA::Any &any, std::string &str) return flag; } +#if !defined(ACE_LACKS_STD_WSTRING) +CORBA::Boolean +operator >>= (const CORBA::Any &any, std::wstring &str) +{ + const wchar_t *buf = 0; + CORBA::Boolean const flag = any >>= buf; + str.assign (buf); + ACE::strdelete (const_cast <wchar_t *> (buf)); + return flag; +} +#endif + #ifdef ACE_ANY_OPS_USE_NAMESPACE } #endif diff --git a/tao/AnyTypeCode/Any.h b/tao/AnyTypeCode/Any.h index 9ff3890fc22..a3a8b2f6088 100644 --- a/tao/AnyTypeCode/Any.h +++ b/tao/AnyTypeCode/Any.h @@ -308,6 +308,10 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Object_ptr); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Object_ptr *); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const std::string &); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, std::string *); +#if !defined(ACE_LACKS_STD_WSTRING) +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const std::wstring &); +TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, std::wstring *); +#endif /// Typesafe extraction. @@ -339,6 +343,10 @@ TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WChar *&); TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, std::string &); +#if !defined(ACE_LACKS_STD_WSTRING) +TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, + std::wstring &); +#endif #ifdef ACE_ANY_OPS_USE_NAMESPACE } diff --git a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 0fbb6b7ce1b..7b75c7130ed 100644 --- a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/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/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index aea65d5d859..dd68e76aeca 100644 --- a/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/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/AnyTypeCode_Adapter.h b/tao/AnyTypeCode_Adapter.h index af26e94bd84..67b830deeb1 100644 --- a/tao/AnyTypeCode_Adapter.h +++ b/tao/AnyTypeCode_Adapter.h @@ -124,6 +124,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/Array_VarOut_T.h b/tao/Array_VarOut_T.h index 904c3d96a29..b6f17f221f5 100644 --- a/tao/Array_VarOut_T.h +++ b/tao/Array_VarOut_T.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef TAO_ARRAY_VAROUT_T_H #define TAO_ARRAY_VAROUT_T_H diff --git a/tao/Basic_Arguments.h b/tao/Basic_Arguments.h index 153c977dd90..5f92282dcd7 100644 --- a/tao/Basic_Arguments.h +++ b/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 diff --git a/tao/BiDir_GIOP/BiDirGIOP.cpp b/tao/BiDir_GIOP/BiDirGIOP.cpp index c91d240c010..15b19c31940 100644 --- a/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -117,6 +117,6 @@ ACE_STATIC_SVC_DEFINE (TAO_BiDirGIOP_Loader, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_FACTORY_DEFINE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) +ACE_FACTORY_DEFINE (TAO_BIDIRGIOP, TAO_BiDirGIOP_Loader) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/BiDir_GIOP/BiDirGIOP.h b/tao/BiDir_GIOP/BiDirGIOP.h index cc3c3c0eb3b..a1c248a7699 100644 --- a/tao/BiDir_GIOP/BiDirGIOP.h +++ b/tao/BiDir_GIOP/BiDirGIOP.h @@ -38,7 +38,7 @@ class TAO_BiDirPolicy_Validator; * @brief Class that loads the BiDir library. */ -class TAO_BiDirGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter +class TAO_BIDIRGIOP_Export TAO_BiDirGIOP_Loader : public TAO_BiDir_Adapter { public: @@ -69,7 +69,7 @@ TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader) -ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) +ACE_FACTORY_DECLARE (TAO_BIDIRGIOP, TAO_BiDirGIOP_Loader) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/tao/BiDir_GIOP/BiDirPolicy_Validator.h index d156e161a51..82cc3789345 100644 --- a/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -36,7 +36,7 @@ class TAO_ORB_Core; * @brief Policy Validator for BiDir GIOP class * */ -class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator +class TAO_BIDIRGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator { public: TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core); diff --git a/tao/BiDir_GIOP/BiDir_GIOP.mpc b/tao/BiDir_GIOP/BiDir_GIOP.mpc index f33fc0b431e..f1c6a688be0 100644 --- a/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -3,11 +3,12 @@ project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \ - -Wb,export_macro=TAO_BiDirGIOP_Export \ - -Wb,export_include=tao/BiDir_GIOP/bidirgiop_export.h \ + -Wb,stub_export_macro=TAO_BIDIRGIOP_Export \ + -Wb,stub_export_include=tao/BiDir_GIOP/bidirgiop_export.h \ + -Wb,stub_export_file=bidirgiop_export.h \ -Wb,include_guard=TAO_BIDIRGIOP_SAFE_INCLUDE \ -Wb,safe_include=tao/BiDir_GIOP/BiDirGIOP.h \ - -iC BiDir_GIOP + -iC BiDir_GIOP -Gxhst BiDirPolicy.pidl } @@ -28,6 +29,7 @@ project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults { Header_Files { *.h + bidirgiop_export.h BiDirPolicyC.h BiDirPolicyS.h } diff --git a/tao/BiDir_GIOP/bidirgiop_export.h b/tao/BiDir_GIOP/bidirgiop_export.h deleted file mode 100644 index 664fba705b7..00000000000 --- a/tao/BiDir_GIOP/bidirgiop_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_BIDIRGIOP_EXPORT_H -#define TAO_BIDIRGIOP_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_BIDIRGIOP_HAS_DLL) -# define TAO_BIDIRGIOP_HAS_DLL 0 -# endif /* ! TAO_BIDIRGIOP_HAS_DLL */ -#else -# if !defined (TAO_BIDIRGIOP_HAS_DLL) -# define TAO_BIDIRGIOP_HAS_DLL 1 -# endif /* ! TAO_BIDIRGIOP_HAS_DLL */ -#endif - -#if defined (TAO_BIDIRGIOP_HAS_DLL) && (TAO_BIDIRGIOP_HAS_DLL == 1) -# if defined (TAO_BIDIRGIOP_BUILD_DLL) -# define TAO_BiDirGIOP_Export ACE_Proper_Export_Flag -# define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_BIDIRGIOP_BUILD_DLL */ -# define TAO_BiDirGIOP_Export ACE_Proper_Import_Flag -# define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_BIDIRGIOP_BUILD_DLL */ -#else /* TAO_BIDIRGIOP_HAS_DLL == 1 */ -# define TAO_BiDirGIOP_Export -# define TAO_BIDIRGIOP_SINGLETON_DECLARATION(T) -# define TAO_BIDIRGIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_BIDIRGIOP_HAS_DLL == 1 */ - -#endif /* TAO_BIDIRGIOP_EXPORT_H */ - -// End of auto generated file. diff --git a/tao/CodecFactory/CodecFactory.cpp b/tao/CodecFactory/CodecFactory.cpp index f1431a88da9..191192cf0ae 100644 --- a/tao/CodecFactory/CodecFactory.cpp +++ b/tao/CodecFactory/CodecFactory.cpp @@ -38,7 +38,7 @@ ACE_STATIC_SVC_DEFINE (TAO_CodecFactory_Loader, &ACE_SVC_NAME (TAO_CodecFactory_Loader), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) -ACE_FACTORY_DEFINE (TAO_CodecFactory, TAO_CodecFactory_Loader) +ACE_FACTORY_DEFINE (TAO_CODECFACTORY, TAO_CodecFactory_Loader) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/CodecFactory/CodecFactory.h b/tao/CodecFactory/CodecFactory.h index 290d2455191..92e28b2b42b 100644 --- a/tao/CodecFactory/CodecFactory.h +++ b/tao/CodecFactory/CodecFactory.h @@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -class TAO_CodecFactory_Export TAO_CodecFactory_Loader +class TAO_CODECFACTORY_Export TAO_CodecFactory_Loader : public TAO_Object_Loader { public: @@ -48,7 +48,7 @@ static int TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader) -ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) +ACE_FACTORY_DECLARE (TAO_CODECFACTORY, TAO_CodecFactory_Loader) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/CodecFactory/CodecFactory.mpc b/tao/CodecFactory/CodecFactory.mpc index 655dd5c29ed..cbda75b62d4 100644 --- a/tao/CodecFactory/CodecFactory.mpc +++ b/tao/CodecFactory/CodecFactory.mpc @@ -3,18 +3,19 @@ project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sal -GX \ - -Wb,export_macro=TAO_CodecFactory_Export \ - -Wb,export_include=tao/CodecFactory/codecfactory_export.h \ + -Wb,stub_export_macro=TAO_CODECFACTORY_Export \ + -Wb,stub_export_include=tao/CodecFactory/codecfactory_export.h \ + -Wb,stub_export_file=codecfactory_export.h \ -Wb,include_guard=TAO_CODECFACTORY_SAFE_INCLUDE \ -Wb,safe_include=tao/CodecFactory/CodecFactory.h \ - -iC tao/CodecFactory + -iC tao/CodecFactory -Gxhst idlflags -= -Sa -St IOP_Codec.pidl } IDL_Files { idlflags += -Sci -SS -Sorb -Sa -GX \ - -Wb,export_macro=TAO_CodecFactory_Export \ + -Wb,export_macro=TAO_CODECFACTORY_Export \ -Wb,export_include=tao/CodecFactory/codecfactory_export.h \ -Wb,unique_include=tao/CodecFactory/CodecFactory.h \ -iC CodecFactory @@ -38,6 +39,7 @@ project(CodecFactory) : taolib, tao_output, install, anytypecode, taoidldefaults } Header_Files { + codecfactory_export.h *.h IOP_CodecA.h IOP_CodecC.h diff --git a/tao/CodecFactory/codecfactory_export.h b/tao/CodecFactory/codecfactory_export.h deleted file mode 100644 index 7c93ff47968..00000000000 --- a/tao/CodecFactory/codecfactory_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_CODECFACTORY_EXPORT_H -#define TAO_CODECFACTORY_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_CODECFACTORY_HAS_DLL) -# define TAO_CODECFACTORY_HAS_DLL 0 -# endif /* ! TAO_CODECFACTORY_HAS_DLL */ -#else -# if !defined (TAO_CODECFACTORY_HAS_DLL) -# define TAO_CODECFACTORY_HAS_DLL 1 -# endif /* ! TAO_CODECFACTORY_HAS_DLL */ -#endif - -#if defined (TAO_CODECFACTORY_HAS_DLL) && (TAO_CODECFACTORY_HAS_DLL == 1) -# if defined (TAO_CODECFACTORY_BUILD_DLL) -# define TAO_CodecFactory_Export ACE_Proper_Export_Flag -# define TAO_CODECFACTORY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_CODECFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_CODECFACTORY_BUILD_DLL */ -# define TAO_CodecFactory_Export ACE_Proper_Import_Flag -# define TAO_CODECFACTORY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_CODECFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_CODECFACTORY_BUILD_DLL */ -#else /* TAO_CODECFACTORY_HAS_DLL == 1 */ -# define TAO_CodecFactory_Export -# define TAO_CODECFACTORY_SINGLETON_DECLARATION(T) -# define TAO_CODECFACTORY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_CODECFACTORY_HAS_DLL == 1 */ - -#endif /* TAO_CODECFACTORY_EXPORT_H */ - -// End of auto generated file. diff --git a/tao/DynamicAny/DynAny_i.h b/tao/DynamicAny/DynAny_i.h index 19f8a31566e..cda8f29c50a 100644 --- a/tao/DynamicAny/DynAny_i.h +++ b/tao/DynamicAny/DynAny_i.h @@ -51,50 +51,32 @@ public: ~TAO_DynAny_i (void); /// Initialize using just a TypeCode - void init (CORBA::TypeCode_ptr tc - ); + void init (CORBA::TypeCode_ptr tc); /// Initialize using an Any. - void init (const CORBA::Any& any - ); + void init (const CORBA::Any& any); // = LocalObject methods. - static TAO_DynAny_i *_narrow ( - CORBA::Object_ptr obj - ); + static TAO_DynAny_i *_narrow (CORBA::Object_ptr obj); // = DynAny common functions not implemented in class TAO_DynCommon. - virtual void from_any ( - const CORBA::Any & value - ) -; + virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any ( - void) -; + virtual CORBA::Any * to_any (void); - virtual CORBA::Boolean equal ( - DynamicAny::DynAny_ptr dyn_any - ) -; + virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy ( - void) -; + virtual void destroy (void); - virtual DynamicAny::DynAny_ptr current_component ( - void) -; + virtual DynamicAny::DynAny_ptr current_component (void); private: /// Check if the typecode is acceptable. - void check_typecode (CORBA::TypeCode_ptr tc - ); + void check_typecode (CORBA::TypeCode_ptr tc); /// Used when we are created from a typecode. - void set_to_default_value (CORBA::TypeCode_ptr tc - ); + void set_to_default_value (CORBA::TypeCode_ptr tc); /// Called by both versions of init(). void init_common (void); diff --git a/tao/Generic_Sequence_T.h b/tao/Generic_Sequence_T.h index f977d4af29f..58500da4aa5 100644 --- a/tao/Generic_Sequence_T.h +++ b/tao/Generic_Sequence_T.h @@ -375,26 +375,26 @@ public: typedef Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > reverse_iterator; typedef Const_Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > const_reverse_iterator; - // Get an iterator that points to the beginning of the sequence. + /// Get an iterator that points to the beginning of the sequence. iterator begin (void) { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this); } - // Get a const iterator that points to the beginning of the sequence. + /// Get a const iterator that points to the beginning of the sequence. const_iterator begin (void) const { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this); } - // Get an iterator that points to the end of the sequence. + /// Get an iterator that points to the end of the sequence. iterator end (void) { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this, this->length_); } - // Get a const iterator that points to the end of the sequence. + /// Get a const iterator that points to the end of the sequence. const_iterator end (void) const { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this, diff --git a/tao/Object.cpp b/tao/Object.cpp index 6acd25d3d5d..2c69cecc82f 100644 --- a/tao/Object.cpp +++ b/tao/Object.cpp @@ -128,8 +128,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr) } /*static*/ CORBA::Boolean -CORBA::Object::marshal (const CORBA::Object_ptr x, - TAO_OutputCDR &cdr) +CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr) { if (x == 0) { diff --git a/tao/Object_KeyC.cpp b/tao/Object_KeyC.cpp index 4de7652ff82..a70f3202210 100644 --- a/tao/Object_KeyC.cpp +++ b/tao/Object_KeyC.cpp @@ -2,7 +2,7 @@ // $Id$ /** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.3 + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4 * TAO and the TAO IDL Compiler have been developed by: * Center for Distributed Object Computing * Washington University diff --git a/tao/Object_KeyC.h b/tao/Object_KeyC.h index 0bb3803c56a..fb0b0532739 100644 --- a/tao/Object_KeyC.h +++ b/tao/Object_KeyC.h @@ -2,7 +2,7 @@ // $Id$ /** - * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.3 + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.4 * TAO and the TAO IDL Compiler have been developed by: * Center for Distributed Object Computing * Washington University @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // w:\tao\tao_idl\be\be_codegen.cpp:150 -#ifndef _TAO_PIDL_OBJECT_KEYC_NYHQMR_H_ -#define _TAO_PIDL_OBJECT_KEYC_NYHQMR_H_ +#ifndef _TAO_PIDL_OBJECT_KEYC_NOCLKU_H_ +#define _TAO_PIDL_OBJECT_KEYC_NOCLKU_H_ #include /**/ "ace/pre.h" @@ -61,8 +61,8 @@ #include "tao/OctetSeqC.h" -#if TAO_MAJOR_VERSION != 2 || TAO_MINOR_VERSION != 0 || TAO_BETA_VERSION != 3 -#error This file should be regenerated with TAO_IDL from version 2.0.3 +#if TAO_MAJOR_VERSION != 2 || TAO_MINOR_VERSION != 0 || TAO_BETA_VERSION != 4 +#error This file should be regenerated with TAO_IDL from version 2.0.4 #endif #if defined (TAO_EXPORT_MACRO) diff --git a/tao/PortableServer/BD_String_SArgument_T.cpp b/tao/PortableServer/BD_String_SArgument_T.cpp index c10caac89fc..a69b65eb075 100644 --- a/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/tao/PortableServer/BD_String_SArgument_T.cpp @@ -3,7 +3,10 @@ #ifndef TAO_BD_STRING_SARGUMENT_T_CPP #define TAO_BD_STRING_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/BD_String_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) diff --git a/tao/PortableServer/Basic_SArgument_T.cpp b/tao/PortableServer/Basic_SArgument_T.cpp index 8dfab051a81..7854e33eee0 100644 --- a/tao/PortableServer/Basic_SArgument_T.cpp +++ b/tao/PortableServer/Basic_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_BASIC_SARGUMENT_T_CPP #define TAO_BASIC_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Basic_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Basic_SArgument_T.inl" diff --git a/tao/PortableServer/Basic_SArgument_T.h b/tao/PortableServer/Basic_SArgument_T.h index ed235cf0bcd..0d0bd17ec1c 100644 --- a/tao/PortableServer/Basic_SArgument_T.h +++ b/tao/PortableServer/Basic_SArgument_T.h @@ -140,7 +140,6 @@ namespace TAO typedef inout_type inout_arg_type; typedef out_type out_arg_type; typedef out_type ret_arg_type; - }; } diff --git a/tao/PortableServer/Basic_SArguments.h b/tao/PortableServer/Basic_SArguments.h index 0fca6f3b1ef..45b91ffcf24 100644 --- a/tao/PortableServer/Basic_SArguments.h +++ b/tao/PortableServer/Basic_SArguments.h @@ -140,6 +140,16 @@ namespace TAO TAO::Any_Insert_Policy_Stream> { }; + +#if !defined(ACE_LACKS_STD_WSTRING) + template<> + class TAO_PortableServer_Export SArg_Traits<std::wstring> + : public Basic_SArg_Traits_T< + std::wstring, + TAO::Any_Insert_Policy_Stream> + { + }; +#endif } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 5fa5e197343..3767425538c 100644 --- a/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP #define TAO_FIXED_ARRAY_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Fixed_Array_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" diff --git a/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/tao/PortableServer/Fixed_Size_SArgument_T.cpp index 66e53e98988..285d90da9c5 100644 --- a/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP #define TAO_FIXED_SIZE_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Fixed_Size_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" diff --git a/tao/PortableServer/Object_SArgument_T.cpp b/tao/PortableServer/Object_SArgument_T.cpp index 00e5b8948e4..163a0813883 100644 --- a/tao/PortableServer/Object_SArgument_T.cpp +++ b/tao/PortableServer/Object_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_OBJECT_SARGUMENT_T_CPP #define TAO_OBJECT_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Object_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Object_SArgument_T.inl" diff --git a/tao/PortableServer/Servant_Base.h b/tao/PortableServer/Servant_Base.h index 65777ee8f75..5b9090eb203 100644 --- a/tao/PortableServer/Servant_Base.h +++ b/tao/PortableServer/Servant_Base.h @@ -63,9 +63,9 @@ class TAO_PortableServer_Export TAO_ServantBase { public: /// Useful for template programming. - typedef ::CORBA::Object _stub_type; - typedef ::CORBA::Object_ptr _stub_ptr_type; - typedef ::CORBA::Object_var _stub_var_type; + typedef CORBA::Object _stub_type; + typedef CORBA::Object_ptr _stub_ptr_type; + typedef CORBA::Object_var _stub_var_type; /// Destructor. virtual ~TAO_ServantBase (void); diff --git a/tao/PortableServer/Special_Basic_SArgument_T.cpp b/tao/PortableServer/Special_Basic_SArgument_T.cpp index 2cdb15d8b5b..6fc56c84267 100644 --- a/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP #define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Special_Basic_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Special_Basic_SArgument_T.inl" diff --git a/tao/PortableServer/UB_String_SArgument_T.cpp b/tao/PortableServer/UB_String_SArgument_T.cpp index 7f8db0408f5..d66915ae066 100644 --- a/tao/PortableServer/UB_String_SArgument_T.cpp +++ b/tao/PortableServer/UB_String_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_UB_STRING_SARGUMENT_T_CPP #define TAO_UB_STRING_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/UB_String_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/UB_String_SArgument_T.inl" diff --git a/tao/PortableServer/Var_Array_SArgument_T.cpp b/tao/PortableServer/Var_Array_SArgument_T.cpp index 0ba7f075cac..70600dbfbbd 100644 --- a/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP #define TAO_VAR_ARRAY_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Var_Array_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Array_SArgument_T.inl" diff --git a/tao/PortableServer/Var_Size_SArgument_T.cpp b/tao/PortableServer/Var_Size_SArgument_T.cpp index a0aed6f8d57..eb1e13e4cb3 100644 --- a/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -3,14 +3,16 @@ #ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP #define TAO_VAR_SIZE_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Var_Size_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, diff --git a/tao/PortableServer/Vector_SArgument_T.cpp b/tao/PortableServer/Vector_SArgument_T.cpp index de157b9975b..a55fed0717e 100644 --- a/tao/PortableServer/Vector_SArgument_T.cpp +++ b/tao/PortableServer/Vector_SArgument_T.cpp @@ -3,13 +3,14 @@ #ifndef TAO_VECTOR_SARGUMENT_T_CPP #define TAO_VECTOR_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Vector_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Vector_SArgument_T.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, diff --git a/tao/TAO_Internal.cpp b/tao/TAO_Internal.cpp index ca1d1fc3c01..30c2851c98b 100644 --- a/tao/TAO_Internal.cpp +++ b/tao/TAO_Internal.cpp @@ -834,7 +834,7 @@ namespace errno = EINVAL; ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Unable to open file <%s>") + ACE_TEXT ("TAO (%P|%t) - Error, unable to open file <%s>") ACE_TEXT (", referenced by -ORBSvcConf option\n"), current_arg), -1); diff --git a/tao/Valuetype/AbstractBase.h b/tao/Valuetype/AbstractBase.h index c03a2061f3f..d0c9620e14d 100644 --- a/tao/Valuetype/AbstractBase.h +++ b/tao/Valuetype/AbstractBase.h @@ -118,8 +118,8 @@ namespace CORBA /// Return the equivalent object reference. /** - * The object is not refcounted. The caler should not put this in - * a var or some such thing. The memory is owned by <this> + * The object is not refcounted. The caller should not put this in + * a var or some such thing. The memory is owned by @c this * object. */ CORBA::Object_ptr equivalent_objref (void); @@ -157,7 +157,7 @@ namespace CORBA /// Our equivalent CORBA::Object version /// @todo We may at some point of time should probably cache a - /// version of CORBA::ValueBase + /// version of CORBA::ValueBase CORBA::Object_var equivalent_obj_; }; diff --git a/tao/Valuetype/Valuetype_Adapter_Impl.h b/tao/Valuetype/Valuetype_Adapter_Impl.h index d9f83443214..55a6b72d1ba 100644 --- a/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * Class that adapts various functions involving the Valuetype, * ValueFactory and AbstractInterface classes. This is a concrete class - * implementating the pure virtual methods of TAO_Valuetype_Adapter + * implementing the pure virtual methods of TAO_Valuetype_Adapter */ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl : public TAO_Valuetype_Adapter diff --git a/tao/Version.h b/tao/Version.h index 3cc92af8360..3830eda9bc1 100644 --- a/tao/Version.h +++ b/tao/Version.h @@ -5,5 +5,5 @@ #define TAO_MAJOR_VERSION 2 #define TAO_MINOR_VERSION 0 -#define TAO_BETA_VERSION 3 -#define TAO_VERSION "2.0.3" +#define TAO_BETA_VERSION 4 +#define TAO_VERSION "2.0.4" |