diff options
Diffstat (limited to 'TAO/tao')
82 files changed, 21 insertions, 481 deletions
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h index 00cdf060c87..789d371b91d 100644 --- a/TAO/tao/Acceptor_Impl.h +++ b/TAO/tao/Acceptor_Impl.h @@ -101,13 +101,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Acceptor_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Acceptor_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_ACCEPTOR_IMPL_H */ diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 43156baa098..dbf21a25ecb 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -115,13 +115,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Alias_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Alias_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Alias_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/Alias_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index 75d1d23a1c3..39e1e8a469c 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -67,13 +67,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Array_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Array_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Array_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index fdd7343bbaf..902b219a567 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -64,13 +64,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Basic_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Basic_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index dd627266355..e58f7734748 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -87,13 +87,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Dual_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Dual_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index 6b36a5289de..9f7866a8b55 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -77,13 +77,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index c57d09c7a04..039935a7b70 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -69,13 +69,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Any_Special_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/AnyTypeCode/Any_Special_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Any_Special_Impl_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 66946b70841..707a495883e 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -116,14 +116,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Enum_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Enum_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Enum_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Enum_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index f655c3353b5..cd0a1550810 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -92,14 +92,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Fixed_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Fixed_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Fixed_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Fixed_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 900ba64df0d..6e9957dda9a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -102,13 +102,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Objref_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Objref_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Objref_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/Objref_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 42eda17ed6a..3b922048bfa 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -170,13 +170,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Recursive_Type_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Recursive_Type_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Recursive_Type_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/Recursive_Type_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 8f0172be861..af3db83cce4 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -105,14 +105,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Sequence_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Sequence_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Sequence_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Sequence_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 4f7385135da..8c1b17337a0 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -91,13 +91,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/String_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/String_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("String_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/String_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index a8911809dfc..e8e8642536b 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -133,14 +133,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Struct_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Struct_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Struct_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Struct_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 3ff1801cffd..2a1777eb29f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -80,14 +80,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Base_Attributes.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Base_Attributes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Base_Attributes.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/TypeCode_Base_Attributes.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 87de72be46e..343c3200ff4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -176,13 +176,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Case_Base_T.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Case_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Case_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/TypeCode_Case_Base_T.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index d23aaa6b247..8ec7ef499a3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -94,13 +94,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Case_Enum_T.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Case_Enum_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index f859e06ff04..97bac3b0a7a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -127,13 +127,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/TypeCode_Case_T.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/TypeCode_Case_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("TypeCode_Case_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/AnyTypeCode/TypeCode_Case_T.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 83077b06840..bfdec5028f9 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -151,14 +151,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Union_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Union_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Union_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Union_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index ebbfa261946..98ebe75a512 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -151,14 +151,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/AnyTypeCode/Value_TypeCode.inl" #endif /* __ACE_INLINE__ */ -#ifdef ACE_TEMPLATES_REQUIRE_SOURCE -# include "tao/AnyTypeCode/Value_TypeCode.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA -# pragma implementation ("Value_TypeCode.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - +#include "tao/AnyTypeCode/Value_TypeCode.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 78ac9ed7eff..25bef261e74 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -227,13 +227,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Array_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index ac11e0957b1..3cb726840da 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -191,13 +191,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/BD_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/BD_String_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BD_String_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 806620dc950..20d5ba83a47 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -168,13 +168,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Basic_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Basic_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index 723de777a9e..21ac929c9ce 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -48,13 +48,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Buffer_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Buffer_Allocator_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_BUFFER_ALLOCATOR_T_H */ diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h index ed391738a38..8cc3e3dd85a 100644 --- a/TAO/tao/Cache_Entries_T.h +++ b/TAO/tao/Cache_Entries_T.h @@ -209,13 +209,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/Cache_Entries_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Cache_Entries_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/Cache_Entries_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index 6819b1b7027..c46d028914c 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -70,13 +70,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Codeset/Codeset_Translator_Factory_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Codeset_Translator_Factory_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_Codeset_Translator_Factory_T */ diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index f89649345d6..14ec7c2ce70 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -110,13 +110,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Condition.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Condition.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Condition.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*TAO_CONDITION_H*/ diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index dc169d494f8..6e417448509 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -16,10 +16,9 @@ TAO_Condition<MUTEX>::wait (MUTEX &mutex, abstime); } -// Peform an "alertable" timed wait. If the argument ABSTIME == 0 -// then we do a regular cond_wait(), else we do a timed wait for up to -// ABSTIME using the Solaris cond_timedwait() function. - +/// Peform an "alertable" timed wait. If the argument ABSTIME == 0 +/// then we do a regular cond_wait(), else we do a timed wait for up to +/// @a abstime template <class MUTEX> ACE_INLINE int TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) { diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index 42ca96486ec..e9ca7c68bc1 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -87,14 +87,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Connector_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Connector_Impl.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*TAO_CONNECTOR_IMPL_H*/ diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.h b/TAO/tao/DynamicAny/DynAnyUtils_T.h index 6d6ba6e033b..9f16ca3b685 100644 --- a/TAO/tao/DynamicAny/DynAnyUtils_T.h +++ b/TAO/tao/DynamicAny/DynAnyUtils_T.h @@ -85,13 +85,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/DynamicAny/DynAnyUtils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/DynamicAny/DynAnyUtils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index 83b5f0a45c9..cf259d74eff 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -179,13 +179,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Fixed_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Fixed_Array_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Array_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 6369762f23d..316533c5656 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -168,13 +168,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Fixed_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Fixed_Size_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Size_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index 69108c9836f..0bd741981cb 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -60,13 +60,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Intrusive_Ref_Count_Base_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Intrusive_Ref_Count_Base_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Base_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index df2fb310c3c..3145ff074c7 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -144,13 +144,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Intrusive_Ref_Count_Handle_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Intrusive_Ref_Count_Handle_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Handle_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index 1d97550e93e..5e2e731e57e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -59,13 +59,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Intrusive_Ref_Count_Object_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Intrusive_Ref_Count_Object_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Intrusive_Ref_Count_Object_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index f8d3762ed62..be3a1b18ef3 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -32,12 +32,6 @@ #include "tao/Any_Insert_Policy_T.h" #include <atomic> -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Stub; diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index bfb8af789da..b9ab71bca9b 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -190,13 +190,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Object_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Object_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Object_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h index a2196feb410..068c7e34039 100644 --- a/TAO/tao/Object_T.h +++ b/TAO/tao/Object_T.h @@ -54,13 +54,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Object_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Object_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 6f7595d1f1a..4ab23d31180 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -118,13 +118,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Objref_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Objref_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Objref_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index e8fd6b39c04..049027473ec 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -88,13 +88,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PI/Interceptor_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Interceptor_List_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index df6ea5d437c..3cf7ed29a6a 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -1,10 +1,6 @@ #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/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index 1dbd80cbcb7..596afcb79f1 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -168,13 +168,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/BD_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/BD_String_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("BD_String_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp index b94ab234a86..69b8bb2525a 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index 634f04ef1e3..95963964245 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -147,13 +147,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Basic_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Basic_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 7ffd4bb26f4..307757ab78b 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 45c969025fb..8adce96633b 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -158,13 +158,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Fixed_Array_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Array_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp index ae9db025549..b5ad7d82dd8 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 575c22be156..aa4874f1317 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -208,13 +208,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Fixed_Size_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Fixed_Size_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp index b3289bcd7e5..fe5f960d60f 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index a11c4181d79..0d14e0dcbae 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -171,13 +171,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Object_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Object_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Object_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index d5ff171f722..d2215dcf051 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -126,13 +126,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/PortableServer/Servant_var.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Servant_var.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/PortableServer/Servant_var.cpp") -#endif #include /**/ "ace/post.h" #endif /* TAO_PORTABLESERVER_SERVANT_VAR_H */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index 8846e19f05b..768d4696efb 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index d8ea769573f..8149c651288 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -161,13 +161,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Special_Basic_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Special_Basic_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Special_Basic_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp index dc9cd4b4b93..1f3d68a1828 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 89792b2d9e7..619a311df04 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -146,13 +146,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/UB_String_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/UB_String_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("UB_String_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index ce95fbe024c..6742fe7f68a 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -1,10 +1,6 @@ #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" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 2f501c27f54..92d9806c505 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -160,13 +160,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Var_Array_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Var_Array_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Array_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp index 285f609dc9d..daa01e75ac8 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -1,10 +1,6 @@ #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__) diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index d86ccc57770..e0d581cd9be 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -149,13 +149,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Var_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Var_Size_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Size_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp index b429071c296..a59fc9069c3 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp @@ -1,10 +1,6 @@ #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__ */ diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h index caf6aecabe8..34b07eda3b7 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.h +++ b/TAO/tao/PortableServer/Vector_SArgument_T.h @@ -155,13 +155,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/PortableServer/Vector_SArgument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/PortableServer/Vector_SArgument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_SArgument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 761414716cb..e379857dbf4 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -124,13 +124,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Pseudo_VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Pseudo_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Pseudo_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index e677d4e505e..56bc34fba27 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -59,13 +59,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Seq_Out_T.inl" #endif /* defined INLINE */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Seq_Out_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Seq_Out_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_SEQ_OUT_T_H */ diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 7596db9730a..9b51200027a 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -128,13 +128,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Seq_Var_T.inl" #endif /* defined INLINE */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Seq_Var_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Seq_Var_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 47b72cabd25..c37630e732d 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -188,13 +188,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Special_Basic_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Special_Basic_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Special_Basic_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 72a37aaaea1..7a4f1bca094 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -454,7 +454,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl () const #if defined(ACE_WIN32) \ && !defined (ACE_LACKS_MSG_WFMO) \ - && !defined (ACE_HAS_WINCE) \ && !defined (ACE_HAS_PHARLAP) case TAO_REACTOR_MSGWFMO: ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor (0, tmq.get ()), 0); diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 75199865edb..153a3d8207d 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -24,12 +24,6 @@ #include "tao/ORB_Core_Auto_Ptr.h" #include <atomic> -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index f8aa2c5beec..c4df7669a0d 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -152,8 +152,6 @@ CORBA::SystemException::_tao_errno (int errno_value) return TAO_ECONNREFUSED_MINOR_CODE; case ENOENT: return TAO_ENOENT_MINOR_CODE; - -#if !defined (ACE_HAS_WINCE) case EMFILE: return TAO_EMFILE_MINOR_CODE; case EBADF: @@ -162,8 +160,6 @@ CORBA::SystemException::_tao_errno (int errno_value) return TAO_EPERM_MINOR_CODE; case EINVAL: return TAO_EINVAL_MINOR_CODE; -#endif // ACE_HAS_WINCE - #if (ENOSYS != EFAULT) case ENOSYS: return TAO_ENOSYS_MINOR_CODE; diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index fe76c2aec9b..9c6c32cfbc7 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -964,7 +964,7 @@ namespace // NOTE: When adding new global arguments, ensure they are only // applied when apply_values is true, but that they are always // consumed, if they need to be consumed. -#if defined (TAO_DEBUG) && !defined (ACE_HAS_WINCE) +#if defined (TAO_DEBUG) // Make it a little easier to debug programs using this code. if (apply_values) { @@ -982,7 +982,7 @@ namespace TAO_debug_level)); } } -#endif /* TAO_DEBUG && !ACE_HAS_WINCE */ +#endif /* TAO_DEBUG */ // Extract the Service Configurator ORB options from the argument // vector. diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h index 4a55e38443e..85c820a5225 100644 --- a/TAO/tao/TAO_Singleton.h +++ b/TAO/tao/TAO_Singleton.h @@ -115,14 +115,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/TAO_Singleton.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/TAO_Singleton.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("TAO_Singleton.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h index 4e31955cdf2..89f2540e346 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h @@ -42,14 +42,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/TransportCurrent/Current_ORBInitializer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/TransportCurrent/Current_ORBInitializer.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h index 7cc7c188264..d7e5ed7d458 100644 --- a/TAO/tao/Transport_Cache_Manager_T.h +++ b/TAO/tao/Transport_Cache_Manager_T.h @@ -269,13 +269,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL # include "tao/Transport_Cache_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Transport_Cache_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("tao/Transport_Cache_Manager_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index 5221d90c31f..2257e339e99 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -171,13 +171,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/UB_String_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/UB_String_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("UB_String_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index be31d6efa04..ddaa3c93487 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -58,9 +58,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "tao/Utils/RIR_Narrow.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "tao/Utils/RIR_Narrow.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h index a194bc0354c..00cccb31b1d 100644 --- a/TAO/tao/Utils/Server_Main.h +++ b/TAO/tao/Utils/Server_Main.h @@ -81,13 +81,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "tao/Utils/Server_Main.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -# pragma implementation "Server_Main.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "tao/Utils/Server_Main.cpp" #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h index a6c3302c4fb..80ec9c2c677 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.h +++ b/TAO/tao/Valuetype/AbstractBase_T.h @@ -43,13 +43,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Valuetype/AbstractBase_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("AbstractBase_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /*TAO_ABSTRACTBASE_T_H*/ diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index b4eba819bb8..1fffb98ffe2 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -111,13 +111,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Valuetype/Value_VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Value_VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index 857399b3332..d436d415ade 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -157,13 +157,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/VarOut_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/VarOut_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("VarOut_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h index f83e7d86abb..739e3e8f160 100644 --- a/TAO/tao/Var_Array_Argument_T.h +++ b/TAO/tao/Var_Array_Argument_T.h @@ -180,13 +180,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Var_Array_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Var_Array_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Array_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index 404a03165a5..b972b9a8a84 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -174,13 +174,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Var_Size_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Var_Size_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Var_Size_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h index 4cc8aa62885..a73a670a2b5 100644 --- a/TAO/tao/Vector_Argument_T.h +++ b/TAO/tao/Vector_Argument_T.h @@ -177,13 +177,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "tao/Vector_Argument_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "tao/Vector_Argument_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Vector_Argument_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 398ef5c1064..cc2b43ce9bd 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -27,12 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (HPUX) && defined (IOR) - /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h - and we don't want that definition. See IOP_IORC.h. */ -# undef IOR -#endif /* HPUX && IOR */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace IOP |