diff options
36 files changed, 139 insertions, 74 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5d74cc3cac2..00ee0f6b4b5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,59 @@ +Tue Feb 2 11:07:14 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * tests/Bug_1361_Regression/server.cpp: + * tests/Bug_1361_Regression/shutdown.cpp: + * tests/Bug_1361_Regression/client.cpp: + * tests/Bug_1361_Regression/Echo.cpp: + * tests/Bug_1361_Regression/Bug_1361_Regression.mpc: + Simplified the test. It used libTAO_Messaging without any + need for it. + + * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h: + * tao/AnyTypeCode/Any_Array_Impl_T.cpp: + * tao/AnyTypeCode/Objref_TypeCode.cpp: + * tao/PortableServer/Any_SArg_Traits.h: + * tao/PortableServer/get_arg.h: + * tao/PI_Server/Policy_Creator_T.h: + * tao/Load_Protocol_Factory_T.h: + * tao/TransportCurrent/IIOP_Current_Impl.h: + * tao/Valuetype/Valuetype_Traits_Base_T.h: + Added required include. + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h: + * tao/TransportCurrent/Current_ORBInitializer.h: + Removed unnecessary for templates export directive. + + * tao/ImR_Client/ServerObject.pidl: + * tao/ImR_Client/ImplRepo.pidl: + * tao/AnyTypeCode/BasicTypeTraits.h: + * tao/IORTable/IORTable.pidl: + * tao/Object_Key.pidl: + * tao/TransportCurrent/Transport_Current.h: + * tao/TransportCurrent/IIOP_Transport_Current.h: + Added inclusion guards. + + * tao/AnyTypeCode/Union_TypeCode.h: + Added necessary forward declaration. + + * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h: + * tao/PortableServer/Upcall_Command.h: + * tao/PortableServer/Upcall_Wrapper.h: + * tao/Object_Reference_Traits_T.h: + * tao/String_Traits_T.h: + * tao/Value_Traits_T.h: + * tao/Array_Traits_T.h: + * tao/Utils/Servant_Var.inl: + * tao/Valuetype/Valuetype_Traits_T.h: + Changed 'ifndef ACE_LACKS_PRAGMA_ONCE' to + 'if !defined (ACE_LACKS_PRAGMA_ONCE)'. So that ifndef is only used + for inclusion guards in TAO. + + * tao/Transport.cpp: + Changed 0 to false for boolean type. + + * tao/RTScheduling/ThreadAction.h: + Fixed code that didn't compile. + Mon Feb 1 19:27:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Notify/QoSProperties.h diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h index 6f68524d8ac..3ca4fe41bde 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/PortableGroup/portablegroup_export.h" +#include "orbsvcs/PortableGroup/PG_Property_Set.h" #include "ace/Hash_Map_Manager.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index 0ff525189cf..3a485b98b72 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -39,7 +39,7 @@ class TAO_Acceptor; * MIOP protocol. */ template<typename CONNECTION_HANDLER> -class TAO_PortableGroup_Export TAO_UIPMC_Transport : public TAO_Transport +class TAO_UIPMC_Transport : public TAO_Transport { public: diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 1e5a798c3c5..025e7008629 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -7,6 +7,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/Marshal.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/debug.h" #include "tao/CDR.h" #include "tao/SystemException.h" diff --git a/TAO/tao/AnyTypeCode/BasicTypeTraits.h b/TAO/tao/AnyTypeCode/BasicTypeTraits.h index 73b3c0b4109..ab3b3dfa917 100644 --- a/TAO/tao/AnyTypeCode/BasicTypeTraits.h +++ b/TAO/tao/AnyTypeCode/BasicTypeTraits.h @@ -12,6 +12,9 @@ */ //============================================================================= +#ifndef BASIC_TYPE_TRAITS_H +#define BASIC_TYPE_TRAITS_H + #include "tao/AnyTypeCode/BasicTypeTraits_T.h" #include "tao/AnyTypeCode/Any.h" @@ -467,3 +470,4 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL +#endif /* BASIC_TYPE_TRAITS_H */ diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index d0b35721fe7..3860c6fb999 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -11,6 +11,7 @@ #include "tao/CDR.h" #include "tao/ORB_Core.h" +#include "tao/TypeCodeFactory_Adapter.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index bbb9d119b00..95ccbb33a3c 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -31,6 +31,7 @@ namespace TAO { namespace TypeCode { + template <typename StringType, typename TypeCodeType> class Case; /** * @class Union diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 1d3b98edb1e..459e03c3405 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -70,7 +70,7 @@ struct array_traits begin, end, &TAO::Array_Traits<forany_type>::zero); } -# ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -81,7 +81,7 @@ struct array_traits TAO::Array_Traits<forany_type>::copy(*dst, *i); } } -#else +# else inline static void copy_range( value_type * begin, value_type * end, value_type *dst) { @@ -92,7 +92,7 @@ struct array_traits } # endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -#ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -100,13 +100,13 @@ struct array_traits { copy_range(begin, end, dst); } -#else +# else inline static void copy_swap_range( value_type * begin, value_type * end, value_type *dst) { copy_range(begin, end, dst); } -#endif /* !ACE_LACKS_MEMBER_TEMPLATES */ +# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ }; } // namespace details diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl index a0e3348f697..fe08dabafc0 100644 --- a/TAO/tao/IORTable/IORTable.pidl +++ b/TAO/tao/IORTable/IORTable.pidl @@ -23,6 +23,9 @@ */ // ================================================================ +#ifndef TAO_IORTABLE_IORTABLE_PIDL +#define TAO_IORTABLE_IORTABLE_PIDL + /// Define a module to avoid namespace pollution module IORTable { @@ -77,3 +80,5 @@ module IORTable raises (NotFound); }; }; + +#endif /* TAO_IORTABLE_IORTABLE_PIDL */ diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl index dbbabe5f789..2cbee7c7825 100644 --- a/TAO/tao/ImR_Client/ImplRepo.pidl +++ b/TAO/tao/ImR_Client/ImplRepo.pidl @@ -15,6 +15,9 @@ */ //============================================================================= +#ifndef TAO_IMRCLIENT_IMPLREPO_PIDL +#define TAO_IMRCLIENT_IMPLREPO_PIDL + #include "tao/ImR_Client/ServerObject.pidl" module ImplementationRepository @@ -174,3 +177,5 @@ module ImplementationRepository oneway void shutdown(in boolean activators, in boolean servers); }; }; + +#endif /* TAO_IMRCLIENT_IMPLREPO_PIDL */ diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl index a22c1b3ea65..dff1b816359 100644 --- a/TAO/tao/ImR_Client/ServerObject.pidl +++ b/TAO/tao/ImR_Client/ServerObject.pidl @@ -15,6 +15,9 @@ */ //============================================================================= +#ifndef TAO_IMRCLIENT_SERVEROBJECT_PIDL +#define TAO_IMRCLIENT_SERVEROBJECT_PIDL + module ImplementationRepository { /** @@ -34,3 +37,5 @@ module ImplementationRepository oneway void shutdown (); }; }; + +#endif /* TAO_IMRCLIENT_SERVEROBJECT_PIDL */ diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h index 433f0a2796b..d161a8e7ef5 100644 --- a/TAO/tao/Load_Protocol_Factory_T.h +++ b/TAO/tao/Load_Protocol_Factory_T.h @@ -18,6 +18,8 @@ #include /**/ "ace/pre.h" #include "tao/Protocol_Factory.h" +#include "tao/Resource_Factory.h" +#include "tao/debug.h" #include "ace/Auto_Ptr.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl index 0cfdffbaedf..327cd2844c4 100644 --- a/TAO/tao/Object_Key.pidl +++ b/TAO/tao/Object_Key.pidl @@ -16,7 +16,12 @@ // After generation the file diffs/Object_Key.diff must be used to manually // patch this file +#ifndef TAO_OBJECTKEY_PIDL +#define TAO_OBJECTKEY_PIDL + module TAO { typedef sequence<octet> ObjectKey; }; + +#endif /* TAO_OBJECTKEY_PIDL */ diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h index 7216a8d6ffd..2d490ef3442 100644 --- a/TAO/tao/Object_Reference_Traits_T.h +++ b/TAO/tao/Object_Reference_Traits_T.h @@ -43,7 +43,7 @@ struct object_reference_traits_decorator std::generate(begin, end, &derived::default_initializer); } -# ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -51,7 +51,7 @@ struct object_reference_traits_decorator { std::transform(begin, end, dst, &derived::duplicate); } -#else +# else inline static void copy_range( object_type ** begin, object_type ** end, object_type ** dst) { @@ -59,7 +59,7 @@ struct object_reference_traits_decorator } # endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -#ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -67,13 +67,13 @@ struct object_reference_traits_decorator { std::swap_ranges(begin, end, dst); } -#else +# else inline static void copy_swap_range( object_type ** begin, object_type ** end, object_type ** dst) { std::swap_ranges(begin, end, dst); } -#endif /* !ACE_LACKS_MEMBER_TEMPLATES */ +# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ inline static void release_range( object_type ** begin, object_type ** end) diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h index 23ce59f29a3..807a2278e85 100644 --- a/TAO/tao/PI_Server/Policy_Creator_T.h +++ b/TAO/tao/PI_Server/Policy_Creator_T.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "tao/ORB_Constants.h" +#include "tao/PolicyC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h index 94980dc0c0b..b03b3fbf5cc 100644 --- a/TAO/tao/PortableServer/Any_SArg_Traits.h +++ b/TAO/tao/PortableServer/Any_SArg_Traits.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/Var_Size_SArgument_T.h" +#include "tao/PortableServer/SArg_Traits_T.h" #include "tao/PortableServer/portableserver_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index 339a0054114..02213483f81 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -17,7 +17,7 @@ #include "tao/PortableServer/portableserver_export.h" -#ifndef ACE_LACKS_PRAGMA_ONCE +#if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* !ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 8ba85735a94..bfd4b9a49b3 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -17,7 +17,7 @@ #include "tao/PortableServer/portableserver_export.h" -#ifndef ACE_LACKS_PRAGMA_ONCE +#if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* !ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index 13bcadd1970..2138e0b62e9 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -19,7 +19,7 @@ #include "tao/PortableServer/portableserver_export.h" -#ifndef ACE_LACKS_PRAGMA_ONCE +#if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* !ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/PortableServer/get_arg.h b/TAO/tao/PortableServer/get_arg.h index 71edeef1282..d04f1194974 100644 --- a/TAO/tao/PortableServer/get_arg.h +++ b/TAO/tao/PortableServer/get_arg.h @@ -29,6 +29,7 @@ #include /**/ "ace/pre.h" +#include "tao/PortableServer/SArg_Traits_T.h" #include "tao/operation_details.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index d34023a9606..2087805741e 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -8,19 +8,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTScheduling/RTSchedulerC.h" +#include "tao/RTScheduling/RTScheduler.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTScheduler_Export TAO_ThreadAction: -public RTScheduling::ThreadAction, + public RTScheduling::ThreadAction, public ::CORBA::LocalObject { - public: - - virtual void do (CORBA::VoidData data - ) - = 0; +public: + virtual void _cxx_do (CORBA::VoidData data) = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h index a72e5f20e93..3c5c6424ff8 100644 --- a/TAO/tao/String_Traits_T.h +++ b/TAO/tao/String_Traits_T.h @@ -41,7 +41,7 @@ struct string_traits_decorator std::generate(begin, end, &derived::default_initializer); } -# ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -49,7 +49,7 @@ struct string_traits_decorator { std::transform(begin, end, dst, &derived::duplicate); } -# else +# else inline static void copy_range( char_type ** begin, char_type ** end, char_type ** dst) { @@ -57,7 +57,7 @@ struct string_traits_decorator } # endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -#ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -65,13 +65,13 @@ struct string_traits_decorator { std::swap_ranges(begin, end, dst); } -#else +# else inline static void copy_swap_range( char_type ** begin, char_type ** end, char_type ** dst) { std::swap_ranges(begin, end, dst); } -#endif /* !ACE_LACKS_MEMBER_TEMPLATES */ +# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ inline static void release_range( char_type ** begin, char_type ** end) diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 2a8b1684b90..3fe918c3a02 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -167,7 +167,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag, #if TAO_HAS_TRANSPORT_CURRENT == 1 , stats_ (0) #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ - , flush_in_post_open_ (0) + , flush_in_post_open_ (false) { ACE_NEW (this->messaging_object_, TAO_GIOP_Message_Base (orb_core, diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h index 34487cd14a3..1265c4e9682 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h @@ -30,7 +30,7 @@ namespace TAO { template <typename Impl> - class TAO_Transport_Current_Export Current_ORBInitializer + class Current_ORBInitializer : public Current_ORBInitializer_Base { public: diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h index 99fac36e54e..5d6beeb0eae 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h @@ -17,6 +17,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/orbconf.h" + #if TAO_HAS_TRANSPORT_CURRENT == 1 #include "tao/TransportCurrent/TC_IIOPC.h" diff --git a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h index 9a59cc00f27..c99479cb0b9 100644 --- a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h +++ b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h @@ -1,6 +1,8 @@ // -*- C++ -*- // $Id$ +#ifndef IIOP_TRANSPORT_CURRENT_H +#define IIOP_TRANSPORT_CURRENT_H #include "tao/TransportCurrent/TCC.h" #include "tao/TransportCurrent/TC_IIOPC.h" @@ -15,3 +17,4 @@ static int tao_iiop_transport_current_initializer_called = #endif /* TAO_AS_STATIC_LIBS */ +#endif /* IIOP_TRANSPORT_CURRENT_H */ diff --git a/TAO/tao/TransportCurrent/Transport_Current.h b/TAO/tao/TransportCurrent/Transport_Current.h index 09809f4ee88..e9ed39b36ff 100644 --- a/TAO/tao/TransportCurrent/Transport_Current.h +++ b/TAO/tao/TransportCurrent/Transport_Current.h @@ -1,6 +1,9 @@ // -*- C++ -*- // $Id$ +#ifndef TRANSPORT_CURRENT_H +#define TRANSPORT_CURRENT_H + #include "tao/TransportCurrent/TCC.h" #include "tao/TransportCurrent/Current_Loader.h" @@ -13,3 +16,4 @@ static int tao_transport_current_initializer_called = #endif /* TAO_AS_STATIC_LIBS */ +#endif /* TRANSPORT_CURRENT_H */ diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl index c1e7465356e..8c7c03374be 100644 --- a/TAO/tao/Utils/Servant_Var.inl +++ b/TAO/tao/Utils/Servant_Var.inl @@ -179,7 +179,7 @@ TAO::Utils::Servant_Var<T>::_retn (void) return rval; } -#ifndef ACE_LACKS_MEMBER_TEMPLATES +#if !defined (ACE_LACKS_MEMBER_TEMPLATES) template <class X, class Y> ACE_INLINE bool operator== (typename TAO::Utils::Servant_Var<X> const & x, diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h index 2783c43084d..cebe01f58dd 100644 --- a/TAO/tao/Value_Traits_T.h +++ b/TAO/tao/Value_Traits_T.h @@ -44,7 +44,7 @@ struct value_traits // Noop for value sequences } -# ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -60,7 +60,7 @@ struct value_traits } # endif /* !ACE_LACKS_MEMBER_TEMPLATES */ -#ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -68,13 +68,13 @@ struct value_traits { copy_range(begin, end, dst); } -#else +# else inline static void copy_swap_range( value_type * begin, value_type * end, value_type * dst) { copy_range(begin, end, dst); } -#endif /* !ACE_LACKS_MEMBER_TEMPLATES */ +# endif /* !ACE_LACKS_MEMBER_TEMPLATES */ }; } // namespace details diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h index 13dfe7ad06d..b65320ecfd3 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h @@ -10,7 +10,7 @@ * @author Carlos O'Ryan */ -#include "tao/Objref_VarOut_T.h" +#include "tao/Valuetype/Value_VarOut_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h index ae21fe9e4d9..74b93e3065c 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h @@ -42,7 +42,7 @@ struct valuetype_traits_decorator std::generate(begin, end, &derived::default_initializer); } -# ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_range( @@ -50,15 +50,15 @@ struct valuetype_traits_decorator { std::transform(begin, end, dst, &derived::duplicate); } -#else +# else inline static void copy_range( object_type ** begin, object_type ** end, object_type ** dst) { std::transform(begin, end, dst, &derived::duplicate); } -#endif /* ACE_LACKS_MEMBER_TEMPLATES */ +# endif /* ACE_LACKS_MEMBER_TEMPLATES */ -#ifndef ACE_LACKS_MEMBER_TEMPLATES +# if !defined (ACE_LACKS_MEMBER_TEMPLATES) // Allow MSVC++ >= 8 checked iterators to be used. template <typename iter> inline static void copy_swap_range( @@ -66,13 +66,13 @@ struct valuetype_traits_decorator { std::swap_ranges(begin, end, dst); } -#else +# else inline static void copy_swap_range( object_type ** begin, object_type ** end, object_type ** dst) { std::swap_ranges(begin, end, dst); } -#endif /* ACE_LACKS_MEMBER_TEMPLATES */ +# endif /* ACE_LACKS_MEMBER_TEMPLATES */ inline static void release_range( object_type ** begin, object_type ** end) diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc index e2c4e4f5bb7..e50d4d3e003 100644 --- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc +++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, messaging { +project(*Server): taoserver { after += *idl Source_Files { TestC.cpp @@ -22,7 +22,8 @@ project(*Server): taoserver, messaging { } } -project(*Client): taoclient, messaging { +project(*Client): taoserver { + exename = client after += *idl Source_Files { TestC.cpp @@ -35,12 +36,11 @@ project(*Client): taoclient, messaging { } } -project(*Shutdown): taoclient, messaging { +project(*Shutdown): taoclient { exename = shutdown after += *idl Source_Files { TestC.cpp - TestS.cpp shutdown.cpp } IDL_Files { diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp index 2a576562d39..bdfc3b0d967 100644 --- a/TAO/tests/Bug_1361_Regression/Echo.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo.cpp @@ -49,5 +49,4 @@ Echo::echo_payload_out (Test::Payload_out data) // Kill the app ACE::terminate_process (ACE_OS::getpid ()); } - } diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index a4ecf15abba..57ae006f44f 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -2,8 +2,6 @@ #include "Echo.h" #include "ORB_Task.h" -#include "tao/Messaging/Messaging.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" @@ -67,29 +65,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent"); - - CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in ()); - - if (CORBA::is_nil (policy_current.in ())) - { - ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n")); - return 1; - } - CORBA::Any scope_as_any; - scope_as_any <<= Messaging::SYNC_WITH_TRANSPORT; - - CORBA::PolicyList policies(1); policies.length (1); - policies[0] = - orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any); - - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); - - policies[0]->destroy (); - if (parse_args (argc, argv) != 0) return 1; diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index 9e389c155c5..ae617a640da 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "Echo_Caller.h" -#include "tao/Messaging/Messaging.h" #include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index d4c8e2320bb..cdf5316cc59 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -3,9 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -// FUZZ: disable check_for_streams_include -#include "ace/streams.h" - ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$") #if defined (ACE_OPENVMS) |