summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Acceptor_Impl.h2
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Any_Array_Impl_T.h2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Impl_T.h2
-rw-r--r--TAO/tao/AnyTypeCode/Any_Special_Impl_T.h2
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Fixed_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Sequence_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h4
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h4
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h4
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_T.h4
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode.h4
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode.h4
-rw-r--r--TAO/tao/Array_VarOut_T.h2
-rw-r--r--TAO/tao/BD_String_Argument_T.h2
-rw-r--r--TAO/tao/Basic_Argument_T.h2
-rw-r--r--TAO/tao/Buffer_Allocator_T.h2
-rw-r--r--TAO/tao/Cache_Entries_T.h2
-rw-r--r--TAO/tao/Codeset/Codeset_Translator_Factory_T.h2
-rw-r--r--TAO/tao/Condition.h2
-rw-r--r--TAO/tao/Connector_Impl.h3
-rw-r--r--TAO/tao/DynamicAny/DynAnyUtils_T.h2
-rw-r--r--TAO/tao/Fixed_Array_Argument_T.h2
-rw-r--r--TAO/tao/Fixed_Size_Argument_T.h2
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Base_T.h2
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Handle_T.h2
-rw-r--r--TAO/tao/Intrusive_Ref_Count_Object_T.h2
-rw-r--r--TAO/tao/Object_Argument_T.h2
-rw-r--r--TAO/tao/Object_T.h2
-rw-r--r--TAO/tao/Objref_VarOut_T.h2
-rw-r--r--TAO/tao/PI/Interceptor_List_T.h2
-rw-r--r--TAO/tao/PortableServer/BD_String_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Basic_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Fixed_Array_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Fixed_Size_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Object_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Servant_var.h6
-rw-r--r--TAO/tao/PortableServer/Special_Basic_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/UB_String_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Var_Array_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Var_Size_SArgument_T.h2
-rw-r--r--TAO/tao/PortableServer/Vector_SArgument_T.h2
-rw-r--r--TAO/tao/Pseudo_VarOut_T.h2
-rw-r--r--TAO/tao/Seq_Out_T.h2
-rw-r--r--TAO/tao/Seq_Var_T.h2
-rw-r--r--TAO/tao/Special_Basic_Argument_T.h2
-rw-r--r--TAO/tao/TAO_Singleton.h2
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer.h2
-rw-r--r--TAO/tao/Transport_Cache_Manager_T.h2
-rw-r--r--TAO/tao/UB_String_Argument_T.h2
-rw-r--r--TAO/tao/Utils/RIR_Narrow.h4
-rw-r--r--TAO/tao/Utils/Server_Main.h4
-rw-r--r--TAO/tao/Valuetype/AbstractBase_T.h2
-rw-r--r--TAO/tao/Valuetype/Value_VarOut_T.h2
-rw-r--r--TAO/tao/VarOut_T.h2
-rw-r--r--TAO/tao/Var_Array_Argument_T.h2
-rw-r--r--TAO/tao/Var_Size_Argument_T.h2
-rw-r--r--TAO/tao/Vector_Argument_T.h2
65 files changed, 16 insertions, 151 deletions
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index 2645d2e3c2b..789d371b91d 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -101,9 +101,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "tao/Acceptor_Impl.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
#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 d6ce5325f28..dbf21a25ecb 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -115,9 +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 */
+#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 2f3046f2b8b..39e1e8a469c 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -67,9 +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 */
#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 165be56e4db..902b219a567 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
@@ -64,9 +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 */
#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 c0fb14ebb21..e58f7734748 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -87,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index d5a000128f7..9f7866a8b55 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -77,9 +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 */
#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 330a947fb38..039935a7b70 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -69,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index d7fd1364a5d..707a495883e 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -116,9 +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 */
+#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 720f8d42190..cd0a1550810 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -92,9 +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 */
+#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 1f5f8872c80..6e9957dda9a 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -102,9 +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 */
+#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 0a919632c8e..3b922048bfa 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -170,9 +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 */
+#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 80a1fc61cbd..af3db83cce4 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -105,9 +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 */
+#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 4a10554b1dd..8c1b17337a0 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -91,9 +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 */
+#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 cd4460d5425..e8e8642536b 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -133,9 +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 */
+#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 f1da3d571f5..2a1777eb29f 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -80,9 +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 */
+#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 40b92e1cf6a..343c3200ff4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -176,9 +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 */
+#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 4df6147a733..8ec7ef499a3 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -94,9 +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 */
+#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 50e6391dcd4..97bac3b0a7a 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -127,9 +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 */
+#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 b9c9ae5b45e..bfdec5028f9 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -151,9 +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 */
+#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 41b7c2b4040..98ebe75a512 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -151,9 +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 */
+#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 21f362b92a9..25bef261e74 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -227,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 071bc111e08..3cb726840da 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -191,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 9bda9d331b9..20d5ba83a47 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -168,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h
index ca01cefbc6f..21ac929c9ce 100644
--- a/TAO/tao/Buffer_Allocator_T.h
+++ b/TAO/tao/Buffer_Allocator_T.h
@@ -48,9 +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 */
#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 dbd2db4c865..8cc3e3dd85a 100644
--- a/TAO/tao/Cache_Entries_T.h
+++ b/TAO/tao/Cache_Entries_T.h
@@ -209,9 +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 */
#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 6a2d04c9c28..c46d028914c 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
@@ -70,9 +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 */
#include /**/ "ace/post.h"
#endif /* TAO_Codeset_Translator_Factory_T */
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index 540472dc9b9..14ec7c2ce70 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -110,9 +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 */
#include /**/ "ace/post.h"
#endif /*TAO_CONDITION_H*/
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index 1a504931fee..e9ca7c68bc1 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -87,10 +87,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "tao/Connector_Impl.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
#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 56b7e1e05d4..9f16ca3b685 100644
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.h
+++ b/TAO/tao/DynamicAny/DynAnyUtils_T.h
@@ -85,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index 6fedf44fce3..cf259d74eff 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -179,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index 61572709ebb..316533c5656 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -168,9 +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 */
#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 4ad34646475..0bd741981cb 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h
@@ -60,9 +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 */
#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 b9a7b4aed02..3145ff074c7 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
@@ -144,9 +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 */
#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 6a0dbb52b16..5e2e731e57e 100644
--- a/TAO/tao/Intrusive_Ref_Count_Object_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h
@@ -59,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index eb436f03a9d..b9ab71bca9b 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -190,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index 58ea3a68455..068c7e34039 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -54,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index dfba6e88ed6..4ab23d31180 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -118,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 506d03483f0..049027473ec 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -88,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index 1d636fd86ef..596afcb79f1 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -168,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
index 41a0588fee3..95963964245 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -147,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index cef4b4befff..8adce96633b 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -158,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index 103861f066a..aa4874f1317 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -208,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index d5233ce3c75..0d14e0dcbae 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -171,9 +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 */
#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.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index adf1e2715cf..8149c651288 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -161,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index bf8fd3fb37b..619a311df04 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -146,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index 76bffae71f7..92d9806c505 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -160,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index e4931099ecf..e0d581cd9be 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -149,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h
index 418d0c373d4..34b07eda3b7 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.h
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.h
@@ -155,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 7da78dae803..e379857dbf4 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -124,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
index 061526c26a2..56bc34fba27 100644
--- a/TAO/tao/Seq_Out_T.h
+++ b/TAO/tao/Seq_Out_T.h
@@ -59,9 +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 */
#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 4126445bfa8..9b51200027a 100644
--- a/TAO/tao/Seq_Var_T.h
+++ b/TAO/tao/Seq_Var_T.h
@@ -128,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index a3c247debbd..c37630e732d 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -188,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h
index 2ee57e09b1b..85c820a5225 100644
--- a/TAO/tao/TAO_Singleton.h
+++ b/TAO/tao/TAO_Singleton.h
@@ -115,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 2299cee62e1..89f2540e346 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -42,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h
index fe16173c100..d7e5ed7d458 100644
--- a/TAO/tao/Transport_Cache_Manager_T.h
+++ b/TAO/tao/Transport_Cache_Manager_T.h
@@ -269,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 22972be4f5b..2257e339e99 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -171,9 +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 */
#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 f864cc150f8..00cccb31b1d 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -81,9 +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 */
+#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 2e334432d98..80ec9c2c677 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -43,9 +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 */
#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 35e2978ab09..1fffb98ffe2 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -111,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
index 386020bc116..d436d415ade 100644
--- a/TAO/tao/VarOut_T.h
+++ b/TAO/tao/VarOut_T.h
@@ -157,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index a9336cd4eb6..739e3e8f160 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -180,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index 479d4a505c9..b972b9a8a84 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -174,9 +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 */
#include /**/ "ace/post.h"
diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h
index 46ea90343f0..a73a670a2b5 100644
--- a/TAO/tao/Vector_Argument_T.h
+++ b/TAO/tao/Vector_Argument_T.h
@@ -177,9 +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 */
#include /**/ "ace/post.h"