diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-01-17 08:30:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 08:30:12 +0100 |
| commit | cf4d1e0117bd0ff7decb0aa07cfa0c88c95e5aa3 (patch) | |
| tree | be9a99541c19d909a27b0462f5eee1f3b2fb0174 | |
| parent | eb19cbfc7b0d9d78150fa5a39cbe571026cacffb (diff) | |
| parent | 2d0b70c587fe5efe64ea80f41d1165784486d716 (diff) | |
| download | ATCD-cf4d1e0117bd0ff7decb0aa07cfa0c88c95e5aa3.tar.gz | |
Merge pull request #2033 from jwillemsen/jwi-ACE_TEMPLATES_REQUIRE_SOURCE
Removed checks for ACE_TEMPLATES_REQUIRE_SOURCE
288 files changed, 32 insertions, 648 deletions
diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h index 1d6386fa318..1fcf16d5cee 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h @@ -66,13 +66,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_CV_Dispatcher_Impl_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_CV_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* DSRT_DIRECT_DISPATCHER_IMPL_T_H */ diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h index 8a1359115dc..b7aa5d00e70 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h @@ -72,13 +72,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_Direct_Dispatcher_Impl_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Direct_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* DSRT_DIRECT_DISPATCHER_IMPL_T_H */ diff --git a/ACE/Kokyu/DSRT_Dispatch_Item_T.h b/ACE/Kokyu/DSRT_Dispatch_Item_T.h index f0239a406ba..d719f5ec8ff 100644 --- a/ACE/Kokyu/DSRT_Dispatch_Item_T.h +++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.h @@ -88,9 +88,7 @@ namespace Kokyu #include "DSRT_Dispatch_Item_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Dispatch_Item_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* DSRT_DISPATCH_ITEM_H */ diff --git a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h index 47c125c525e..e56454d7ef6 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h @@ -192,9 +192,7 @@ namespace Kokyu #include "DSRT_Dispatcher_Impl_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Dispatcher_Impl_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* DSRT_DISPATCHER_IMPL_H */ diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.h b/ACE/Kokyu/DSRT_Sched_Queue_T.h index 921ac6eda07..6cdb0abf177 100644 --- a/ACE/Kokyu/DSRT_Sched_Queue_T.h +++ b/ACE/Kokyu/DSRT_Sched_Queue_T.h @@ -208,13 +208,7 @@ namespace Kokyu }; } -#if !defined (__ACE_INLINE__) -//#include "DSRT_Sched_Queue_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "DSRT_Sched_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* DSRT_SCHED_QUEUE_T_H */ diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h index ddafbd19519..e96d6619722 100644 --- a/ACE/Kokyu/Kokyu_dsrt.h +++ b/ACE/Kokyu/Kokyu_dsrt.h @@ -157,9 +157,7 @@ namespace Kokyu #include "Kokyu_dsrt.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Kokyu_dsrt.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* KOKYU_DSRT_H */ diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h index 50e43905185..eb03fc776f4 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -320,9 +320,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/ARGV.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/ARGV.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_ARGUMENT_VECTOR_H */ diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h index a67a1d43190..23e46afc4c1 100644 --- a/ACE/ace/Abstract_Timer_Queue.h +++ b/ACE/ace/Abstract_Timer_Queue.h @@ -218,9 +218,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Abstract_Timer_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_ABSTRACT_TIMER_QUEUE_H */ diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index 7dc9deaf300..5ebbeeb5fa7 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -684,9 +684,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index 513f42ccfdc..be1e78ad596 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -192,9 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Active_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Active_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_ACTIVE_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h index 32d792d9875..c714b992ecb 100644 --- a/ACE/ace/Arg_Shifter.h +++ b/ACE/ace/Arg_Shifter.h @@ -226,9 +226,7 @@ typedef ACE_Arg_Shifter_T<ACE_TCHAR> ACE_Arg_Shifter; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Arg_Shifter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h index 33ccbd01d0b..f16aa65ed69 100644 --- a/ACE/ace/Array_Base.h +++ b/ACE/ace/Array_Base.h @@ -236,9 +236,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Array_Base.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Array_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h index 64593cdb701..d7ddf25535c 100644 --- a/ACE/ace/Array_Map.h +++ b/ACE/ace/Array_Map.h @@ -287,9 +287,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Array_Map.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Array_Map.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "ace/Array_Map.cpp" #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index 5354fde8d6c..16f4edb0dc3 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -260,9 +260,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h index f2790657583..aa1f763411a 100644 --- a/ACE/ace/Asynch_Connector.h +++ b/ACE/ace/Asynch_Connector.h @@ -154,9 +154,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Asynch_Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h index 3855803a448..751387f9ce7 100644 --- a/ACE/ace/Atomic_Op_GCC_T.h +++ b/ACE/ace/Atomic_Op_GCC_T.h @@ -120,9 +120,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Atomic_Op_GCC_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Atomic_Op_GCC_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */ diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h index 9cd9f49b7dd..e3752ccbd4c 100644 --- a/ACE/ace/Atomic_Op_T.h +++ b/ACE/ace/Atomic_Op_T.h @@ -344,9 +344,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Atomic_Op_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Atomic_Op_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /*ACE_ATOMIC_OP_T_H*/ diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h index 707f6a0813b..c71e46c17be 100644 --- a/ACE/ace/Auto_Event.h +++ b/ACE/ace/Auto_Event.h @@ -92,9 +92,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_AUTO_EVENT_H */ diff --git a/ACE/ace/Auto_Functor.h b/ACE/ace/Auto_Functor.h index cbf4827b6a4..e64bcdf6bb3 100644 --- a/ACE/ace/Auto_Functor.h +++ b/ACE/ace/Auto_Functor.h @@ -109,9 +109,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Auto_Functor.inl" #endif /* __ACE_INLINE__ */ -#if defined(ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Auto_Functor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "ace/Auto_Functor.cpp" #include /**/ "ace/post.h" #endif /* ACE_AUTO_FUNCTOR_H*/ diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index f7c10f7a00d..afbde550e51 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -65,9 +65,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Auto_IncDec_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_IncDec_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 6897e82feb7..43b704e02bb 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -192,9 +192,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (_MSC_VER) // Restore the warning state to what it was before entry. diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h index 79f8df104a1..254371f305e 100644 --- a/ACE/ace/Based_Pointer_T.h +++ b/ACE/ace/Based_Pointer_T.h @@ -176,9 +176,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Based_Pointer_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Based_Pointer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index dcbe4b1e753..3b736a14942 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -366,9 +366,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Bound_Ptr.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Bound_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index 4f7d3473f6a..ce8016af06e 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -384,9 +384,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Cache_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h index 2788d808506..dd762faa2eb 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.h +++ b/ACE/ace/Cached_Connect_Strategy_T.h @@ -247,9 +247,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cached_Connect_Strategy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* CACHED_CONNECT_STRATEGY_T_H */ diff --git a/ACE/ace/Caching_Strategies_T.h b/ACE/ace/Caching_Strategies_T.h index c3741ce4e30..8960ddd937b 100644 --- a/ACE/ace/Caching_Strategies_T.h +++ b/ACE/ace/Caching_Strategies_T.h @@ -538,9 +538,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Caching_Strategies_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Caching_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h index 24903b8dbd9..66ba434c9dd 100644 --- a/ACE/ace/Caching_Utility_T.h +++ b/ACE/ace/Caching_Utility_T.h @@ -288,9 +288,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Caching_Utility_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h index 4abd3a1246f..9ec2afcdb6e 100644 --- a/ACE/ace/Cleanup_Strategies_T.h +++ b/ACE/ace/Cleanup_Strategies_T.h @@ -130,9 +130,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Cleanup_Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* CLEANUP_STRATEGIES_H */ diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h index d460075e63d..f70ea1dad13 100644 --- a/ACE/ace/Condition_T.h +++ b/ACE/ace/Condition_T.h @@ -152,9 +152,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Condition_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Condition_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index 673d1d8455e..2903ad6a750 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -564,9 +564,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h index 1d9a03d92f7..8282dca833d 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -2019,9 +2019,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Containers_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Containers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h index 5dc11013c0e..86bbf224f7e 100644 --- a/ACE/ace/Countdown_Time_T.h +++ b/ACE/ace/Countdown_Time_T.h @@ -89,8 +89,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Countdown_Time_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Countdown_Time_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_COUNTDOWN_TIME_T_H */ diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h index c791f476d18..3d1cc3650ac 100644 --- a/ACE/ace/Dump_T.h +++ b/ACE/ace/Dump_T.h @@ -68,9 +68,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ((void *) this); #endif /* ACE_NDEBUG */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Dump_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_DUMP_T_H */ diff --git a/ACE/ace/Dynamic_Service.h b/ACE/ace/Dynamic_Service.h index 5f99474b72a..ed866b3f78e 100644 --- a/ACE/ace/Dynamic_Service.h +++ b/ACE/ace/Dynamic_Service.h @@ -74,9 +74,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Dynamic_Service.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "ace/Dynamic_Service.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h index 99ed94690d3..e080cafcec6 100644 --- a/ACE/ace/Env_Value_T.h +++ b/ACE/ace/Env_Value_T.h @@ -78,9 +78,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Env_Value_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Env_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h index 314fd3398d2..f0727003f53 100644 --- a/ACE/ace/Event.h +++ b/ACE/ace/Event.h @@ -77,9 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Event.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_H */ diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index 15dd2d720bc..c4597926762 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -173,9 +173,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Event_Handler_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Event_Handler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ diff --git a/ACE/ace/Framework_Component_T.h b/ACE/ace/Framework_Component_T.h index fd9ae43fffb..e23f11889f5 100644 --- a/ACE/ace/Framework_Component_T.h +++ b/ACE/ace/Framework_Component_T.h @@ -57,9 +57,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_Framework_Repository::instance ()->register_component \ (new ACE_Framework_Component_T<CLASS> (INSTANCE)); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Framework_Component_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_FRAMEWORK_COMPONENT_T_H */ diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h index a71f99c204c..a6252fe85ed 100644 --- a/ACE/ace/Free_List.h +++ b/ACE/ace/Free_List.h @@ -137,9 +137,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Free_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_FREE_LIST_H */ diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index 2c26f645c0d..4a9fb185dd2 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -180,9 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Functor_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Functor_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_FUNCTOR_T_H */ diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index 092682752ec..e07756fc880 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -362,9 +362,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Future.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h index 2d43f193730..ed1eb0999bf 100644 --- a/ACE/ace/Future_Set.h +++ b/ACE/ace/Future_Set.h @@ -126,9 +126,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Future_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index b95fb142ef6..b73346b6b4e 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -378,9 +378,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Guard_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Guard_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_GUARD_T_H */ diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h index fa6127e63ca..9b94124afab 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.h +++ b/ACE/ace/Hash_Cache_Map_Manager_T.h @@ -196,9 +196,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Hash_Cache_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Cache_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index 5b15ab8dde4..045c2935020 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -1281,9 +1281,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Hash_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_MANAGER_T_H */ diff --git a/ACE/ace/Hash_Map_With_Allocator_T.h b/ACE/ace/Hash_Map_With_Allocator_T.h index 7636acca610..eb8473305d6 100644 --- a/ACE/ace/Hash_Map_With_Allocator_T.h +++ b/ACE/ace/Hash_Map_With_Allocator_T.h @@ -97,9 +97,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Hash_Map_With_Allocator_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Map_With_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MAP_WITH_ALLOCATOR_T_H */ diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index ba3651084ef..dfa34ea9c5f 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -946,9 +946,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Hash_Multi_Map_Manager_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Hash_Multi_Map_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HASH_MULTI_MAP_MANAGER_T_H */ diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h index 9034b5e4129..0ac556978a5 100644 --- a/ACE/ace/IOStream_T.h +++ b/ACE/ace/IOStream_T.h @@ -266,13 +266,11 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -# if defined (__ACE_INLINE__) -# include "ace/IOStream_T.inl" -# endif /* __ACE_INLINE__ */ +#if defined (__ACE_INLINE__) +# include "ace/IOStream_T.inl" +#endif /* __ACE_INLINE__ */ -# if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/IOStream_T.cpp" -# endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#include "ace/IOStream_T.cpp" #include /**/ "ace/post.h" #endif /* ACE_IOSTREAM_T_H */ diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h index 86ebe780aec..88357cf0215 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.h +++ b/ACE/ace/Intrusive_Auto_Ptr.h @@ -140,9 +140,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_Auto_Ptr.inl" #endif /* __ACE_INLINE __ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h index a6455ae7ff1..58a820a840b 100644 --- a/ACE/ace/Intrusive_List.h +++ b/ACE/ace/Intrusive_List.h @@ -124,9 +124,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_List.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_H */ diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h index f834f3ba67f..73506d48ba7 100644 --- a/ACE/ace/Intrusive_List_Node.h +++ b/ACE/ace/Intrusive_List_Node.h @@ -70,9 +70,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Intrusive_List_Node.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Intrusive_List_Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_INTRUSIVE_LIST_NODE_H */ diff --git a/ACE/ace/LOCK_SOCK_Acceptor.h b/ACE/ace/LOCK_SOCK_Acceptor.h index 298bc5ea097..907e6f3bca1 100644 --- a/ACE/ace/LOCK_SOCK_Acceptor.h +++ b/ACE/ace/LOCK_SOCK_Acceptor.h @@ -53,9 +53,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/LOCK_SOCK_Acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_LOCK_SOCK_ACCEPTOR_H */ diff --git a/ACE/ace/Local_Name_Space_T.h b/ACE/ace/Local_Name_Space_T.h index fc811bfdb72..04dc0e5acd2 100644 --- a/ACE/ace/Local_Name_Space_T.h +++ b/ACE/ace/Local_Name_Space_T.h @@ -254,9 +254,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Local_Name_Space_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_LOCAL_NAME_SPACE_T_H */ diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h index 4ad62bbb9b0..dbc02adb6bb 100644 --- a/ACE/ace/Lock_Adapter_T.h +++ b/ACE/ace/Lock_Adapter_T.h @@ -107,9 +107,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Lock_Adapter_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Lock_Adapter_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_LOCK_ADAPTER_T_H */ diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index 31d5b8006c5..273bb013dcb 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -881,9 +881,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Malloc_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Malloc_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_MALLOC_H */ diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index ee9b7464da8..d18863842af 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -146,9 +146,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Managed_Object.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Managed_Object.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h index 3f52aa3ca41..b4754c49194 100644 --- a/ACE/ace/Manual_Event.h +++ b/ACE/ace/Manual_Event.h @@ -88,9 +88,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Manual_Event.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_MANUAL_EVENT_H */ diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index f04faa5d95e..0c887a412a9 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -696,9 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Map_Manager.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Map_Manager.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index e7cb62d0045..3e6d29fa145 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -1552,9 +1552,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Map_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Map_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_MAP_T_H */ diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h index 4423a888c73..0265992931c 100644 --- a/ACE/ace/Message_Block_T.h +++ b/ACE/ace/Message_Block_T.h @@ -73,9 +73,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Message_Block_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Message_Block_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_MESSAGE_BLOCK_T_H */ diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index 3edecb2565b..cfd3fdd43a6 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -1561,9 +1561,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Message_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index 6fb9acbd566..9488c81b7ae 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -222,9 +222,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Metrics_Cache_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Metrics_Cache_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* defined (ACE_COMPILE_TIMEPROBES) */ diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h index ecb7a4c5a05..bb5f31578d2 100644 --- a/ACE/ace/Module.h +++ b/ACE/ace/Module.h @@ -201,9 +201,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Module.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Module.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h index 4fe6c4e47f3..523cbec4b35 100644 --- a/ACE/ace/Node.h +++ b/ACE/ace/Node.h @@ -70,9 +70,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Node.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_NODE_H */ diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h index 585f6ff3ad5..27d08d37976 100644 --- a/ACE/ace/Obstack_T.h +++ b/ACE/ace/Obstack_T.h @@ -114,9 +114,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Obstack_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Obstack_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_OBSTACK_T_H */ diff --git a/ACE/ace/Pair_T.h b/ACE/ace/Pair_T.h index d1cd354b800..ac352ef5d54 100644 --- a/ACE/ace/Pair_T.h +++ b/ACE/ace/Pair_T.h @@ -63,9 +63,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Pair_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Pair_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_PAIR_T_H */ diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index 0540abb8154..0bf1f40d9a7 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -118,11 +118,9 @@ public: /** * @note This method is inlined here rather than in RB_Tree.inl * since that file may be included multiple times when - * inlining is disabled and on platforms where - * @c ACE_TEMPLATES_REQUIRE_SOURCE is defined. In those - * platform/configuration combinations, multiple definitions - * of this method occurred. Placing the definition inline in - * the header avoids such errors. + * inlining is disabled. In those platform/configuration + * combinations, multiple definitions of this method occurred. + * Placing the definition inline in the header avoids such errors. */ ACE_Allocator * allocator () const { return this->allocator_; } @@ -871,9 +869,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/RB_Tree.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/RB_Tree.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ! defined (ACE_RB_TREE_H) */ diff --git a/ACE/ace/README b/ACE/ace/README index 6fabe1a489c..9e80e74fe35 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -79,10 +79,6 @@ ACE_HAS_TRACE Defined when ACE_NTRACE=0 to ACE_PAGE_SIZE Defines the page size of the system (not used on Win32 or with ACE_HAS_GETPAGESIZE). -ACE_TEMPLATES_REQUIRE_SOURCE Compiler's template mechanim - must see source code (i.e., - .cpp files). This is used for - GNU G++. ACE_TIMEPROBE_ASSERTS_FIXED_SIZE If enabled then ACE_Timeprobe_Ex<>::timeprobe() will assert if the end of the buffer is reached. If disabled, the diff --git a/ACE/ace/Reactor_Token_T.h b/ACE/ace/Reactor_Token_T.h index d30178e5283..2d7933fb834 100644 --- a/ACE/ace/Reactor_Token_T.h +++ b/ACE/ace/Reactor_Token_T.h @@ -79,9 +79,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Reactor_Token_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_REACTOR_TOKEN_T_H */ diff --git a/ACE/ace/Refcountable_T.h b/ACE/ace/Refcountable_T.h index 234aa4bdf04..5dab2e6e540 100644 --- a/ACE/ace/Refcountable_T.h +++ b/ACE/ace/Refcountable_T.h @@ -54,9 +54,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Refcountable_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Refcountable_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /*ACE_REFCOUNTABLE_T_H*/ diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h index 199f3fe6056..e63af3a0481 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.h +++ b/ACE/ace/Refcounted_Auto_Ptr.h @@ -183,9 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Refcounted_Auto_Ptr.inl" -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Refcounted_Auto_Ptr.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index 0f54e717e38..9f0d2ae659f 100644 --- a/ACE/ace/Reverse_Lock_T.h +++ b/ACE/ace/Reverse_Lock_T.h @@ -122,9 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Reverse_Lock_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Reverse_Lock_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_REVERSE_LOCK_T_H */ diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl index 75b261a34c2..1757425725c 100644 --- a/ACE/ace/SString.inl +++ b/ACE/ace/SString.inl @@ -1,7 +1,5 @@ // -*- C++ -*- -// Include ACE.h only if it hasn't already been included, e.g., if -// ACE_TEMPLATES_REQUIRE_SOURCE, ACE.h won't have been pulled in by -// String_Base.cpp. +// Include ACE.h only if it hasn't already been included #ifndef ACE_ACE_H # include "ace/ACE.h" #endif /* !ACE_ACE_H */ diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index 48b36a2611f..e515bc756b0 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -696,9 +696,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Select_Reactor_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Select_Reactor_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_SELECT_REACTOR_T_H */ diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h index 44616f094e7..c8c7f7de56d 100644 --- a/ACE/ace/Singleton.h +++ b/ACE/ace/Singleton.h @@ -324,9 +324,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Singleton.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Singleton.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_SINGLETON_H */ diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index ff512109b80..4b7b7f00510 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -1032,9 +1032,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Strategies_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Strategies_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Stream.h b/ACE/ace/Stream.h index 018e221e0b1..09e2f0f3335 100644 --- a/ACE/ace/Stream.h +++ b/ACE/ace/Stream.h @@ -237,9 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Stream.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Stream_Modules.h b/ACE/ace/Stream_Modules.h index 0ca292e907b..f3812e0fa86 100644 --- a/ACE/ace/Stream_Modules.h +++ b/ACE/ace/Stream_Modules.h @@ -152,9 +152,7 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Stream_Modules.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_STREAM_MODULES */ diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 8217e76cb55..6231151de70 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -876,9 +876,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/String_Base.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/String_Base.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index 2a44184023a..176ab2ba328 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -337,9 +337,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Svc_Handler.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index cb2e6b8ddce..af13d17b733 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -252,9 +252,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/TSS_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/TSS_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TSS_T_H */ diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h index 881ab40bd26..744bbff9122 100644 --- a/ACE/ace/Task_Ex_T.h +++ b/ACE/ace/Task_Ex_T.h @@ -180,9 +180,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Task_Ex_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Task_Ex_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TASK_EX_H */ diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h index b9574fee36c..701b96b88e6 100644 --- a/ACE/ace/Task_T.h +++ b/ACE/ace/Task_T.h @@ -183,9 +183,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Task_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Task_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TASK_T_H */ diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h index 56fb8f57d15..c174ca3d4da 100644 --- a/ACE/ace/Test_and_Set.h +++ b/ACE/ace/Test_and_Set.h @@ -57,9 +57,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Test_and_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TEST_AND_SET_H */ diff --git a/ACE/ace/Time_Policy_T.h b/ACE/ace/Time_Policy_T.h index cd0de6649e5..de54653af13 100644 --- a/ACE/ace/Time_Policy_T.h +++ b/ACE/ace/Time_Policy_T.h @@ -62,8 +62,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Time_Policy_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Time_Policy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_TIME_POLICY_T_H */ diff --git a/ACE/ace/Time_Value_T.h b/ACE/ace/Time_Value_T.h index 5b570e00fa7..32b32df3d41 100644 --- a/ACE/ace/Time_Value_T.h +++ b/ACE/ace/Time_Value_T.h @@ -178,9 +178,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Time_Value_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Time_Value_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIME_VALUE_T_H */ diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h index a51e3fd2238..883c9e19e0d 100644 --- a/ACE/ace/Timeprobe_T.h +++ b/ACE/ace/Timeprobe_T.h @@ -203,9 +203,7 @@ protected: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timeprobe_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_COMPILE_TIMEPROBES */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h index 9529f8e6d98..2bbe5fff078 100644 --- a/ACE/ace/Timer_Hash_T.h +++ b/ACE/ace/Timer_Hash_T.h @@ -337,9 +337,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_HASH_T_H */ diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h index c15b373cace..edde952efcd 100644 --- a/ACE/ace/Timer_Heap_T.h +++ b/ACE/ace/Timer_Heap_T.h @@ -332,9 +332,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_HEAP_T_H */ diff --git a/ACE/ace/Timer_List_T.h b/ACE/ace/Timer_List_T.h index 73479f624ca..18a05c4fe01 100644 --- a/ACE/ace/Timer_List_T.h +++ b/ACE/ace/Timer_List_T.h @@ -215,9 +215,7 @@ private: void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &) = delete; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_LIST_T_H */ diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 20970a7dc21..6e731a1caf9 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -251,9 +251,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Timer_Queue_Adapters.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "ace/Timer_Queue_Adapters.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ADAPTERS_H */ diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h index 7ba8cd0bfe3..d550397791b 100644 --- a/ACE/ace/Timer_Queue_Iterator.h +++ b/ACE/ace/Timer_Queue_Iterator.h @@ -187,9 +187,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_Iterator.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_Iterator.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_ITERATOR_H */ diff --git a/ACE/ace/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h index 8978f7a0e44..060285cdf19 100644 --- a/ACE/ace/Timer_Queue_T.h +++ b/ACE/ace/Timer_Queue_T.h @@ -237,9 +237,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Timer_Queue_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_QUEUE_T_H */ diff --git a/ACE/ace/Timer_Wheel_T.h b/ACE/ace/Timer_Wheel_T.h index 65b14a7f9b1..8d16b81400b 100644 --- a/ACE/ace/Timer_Wheel_T.h +++ b/ACE/ace/Timer_Wheel_T.h @@ -213,9 +213,7 @@ private: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Timer_Wheel_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TIMER_WHEEL_T_H */ diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h index 911478182c3..a9ade225b02 100644 --- a/ACE/ace/Tokenizer_T.h +++ b/ACE/ace/Tokenizer_T.h @@ -226,9 +226,7 @@ typedef ACE_Tokenizer_T <ACE_TCHAR> ACE_Tokenizer; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Tokenizer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Typed_SV_Message.h b/ACE/ace/Typed_SV_Message.h index 66c6af0ca19..a901e1de01c 100644 --- a/ACE/ace/Typed_SV_Message.h +++ b/ACE/ace/Typed_SV_Message.h @@ -91,9 +91,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Typed_SV_Message.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Typed_SV_Message.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/Typed_SV_Message_Queue.h b/ACE/ace/Typed_SV_Message_Queue.h index c482ea06e1b..7e9fe558bf6 100644 --- a/ACE/ace/Typed_SV_Message_Queue.h +++ b/ACE/ace/Typed_SV_Message_Queue.h @@ -77,9 +77,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Typed_SV_Message_Queue.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Typed_SV_Message_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_TYPED_MESSAGE_QUEUE_H */ diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h index 51d2d09a7bd..6d20557c0b5 100644 --- a/ACE/ace/Unbounded_Queue.h +++ b/ACE/ace/Unbounded_Queue.h @@ -279,9 +279,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Queue.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Queue.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_QUEUE_H */ diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h index 8edc0bc06a5..79fd80c7610 100644 --- a/ACE/ace/Unbounded_Set.h +++ b/ACE/ace/Unbounded_Set.h @@ -86,9 +86,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Set.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Set.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h index e8ab9ba21a7..e30a8e1a3ba 100644 --- a/ACE/ace/Unbounded_Set_Ex.h +++ b/ACE/ace/Unbounded_Set_Ex.h @@ -356,9 +356,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Unbounded_Set_Ex.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Unbounded_Set_Ex.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_UNBOUNDED_SET_H */ diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index 7d3f7b08711..1674d2856d0 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -260,9 +260,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Vector_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Vector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h index 53925b24e02..102923c1941 100644 --- a/ACE/ace/config-all.h +++ b/ACE/ace/config-all.h @@ -70,6 +70,10 @@ # include "ace/Trace.h" #endif /* ACE_OS_NTRACE */ +#if !defined (ACE_TEMPLATES_REQUIRE_SOURCE) +# define ACE_TEMPLATES_REQUIRE_SOURCE +#endif + #if !defined (ACE_HAS_MONITOR_FRAMEWORK) # define ACE_HAS_MONITOR_FRAMEWORK 1 #endif diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index a6b51e705ad..9ab89245007 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -14,8 +14,6 @@ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ #define ACE_CC_BETA_VERSION (0) -#define ACE_TEMPLATES_REQUIRE_SOURCE - #if __cplusplus >= 202002L # define ACE_HAS_CPP20 #endif diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index ce825d2beed..65a21df7f52 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -57,8 +57,6 @@ # define ACE_HAS_INTEL_ASSEMBLY #endif -#define ACE_TEMPLATES_REQUIRE_SOURCE - #if (__INTEL_COMPILER >= 910) # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS #endif diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 3628279d01e..92495ed7cd3 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -24,7 +24,6 @@ #define ACE_LACKS_GETEGID #define ACE_LACKS_GETGID -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define TAO_USE_SEQUENCE_TEMPLATES #define _REENTRANT #define ACE_MT_SAFE 1 diff --git a/ACE/ace/config-mqx.h b/ACE/ace/config-mqx.h index b27de279666..028b9c367af 100644 --- a/ACE/ace/config-mqx.h +++ b/ACE/ace/config-mqx.h @@ -55,7 +55,6 @@ extern "C" { #define ACE_RENAME_EQUIVALENT MQX_Filesystem::inst().rename #define ACE_MQX -#define ACE_TEMPLATES_REQUIRE_SOURCE #define ACE_PAGE_SIZE 4096 #define ACE_SOCKET_LEN uint16_t #define ACE_SOCKOPT_LEN socklen_t diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index 908aef297c9..75fafb245d4 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -38,7 +38,5 @@ # define ACE_LACKS_PRAGMA_ONCE #endif /* ! ACE_LACKS_PRAGMA_ONCE */ -#define ACE_TEMPLATES_REQUIRE_SOURCE - #include /**/ "ace/post.h" #endif /* ACE_SUNCC_COMMON_H */ diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index 2e2ef3b9d03..cea92f98471 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -33,9 +33,6 @@ #ifndef ACE_LACKS_UNBUFFERED_STREAMBUF #define ACE_LACKS_UNBUFFERED_STREAMBUF 1 #endif /* ACE_LACKS_UNBUFFERED_STREAMBUF */ -#ifndef ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ // Forte 7 seems to botch this one... #ifndef ACE_HAS_THR_C_DEST #define ACE_HAS_THR_C_DEST 1 diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h index 430923a9c7e..91983c3f2d6 100644 --- a/ACE/ace/config-vxworks6.4.h +++ b/ACE/ace/config-vxworks6.4.h @@ -42,9 +42,6 @@ # define _C99 # endif # endif - -#elif defined (__DCC__) -# define ACE_TEMPLATES_REQUIRE_SOURCE #else /* ! __GNUG__ && !__DCC__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler on VxWorks diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 096feb0eb43..1ffc9968e98 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -114,7 +114,6 @@ #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 -#define ACE_TEMPLATES_REQUIRE_SOURCE 1 #if defined (ACE_HAS_BCC32) # define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" # define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index b3978f03544..18fea9a9a5e 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -50,8 +50,6 @@ #define ACE_LACKS_STRRECVFD -#define ACE_TEMPLATES_REQUIRE_SOURCE - // Platform provides ACE_TLI function prototypes. // For Win32, this is not really true, but saves a lot of hassle! #define ACE_HAS_TLI_PROTOTYPES diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h index b93be9570c6..1e2fdae4990 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.h +++ b/ACE/apps/Gateway/Gateway/File_Parser.h @@ -88,8 +88,6 @@ protected: FILE *infile_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "File_Parser.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* _FILE_PARSER */ diff --git a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h index 1de9bacbe3a..18fdd582dab 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h +++ b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.h @@ -24,8 +24,6 @@ size_t ace_array_encode (void *buf, const T &x); template <class T> size_t ace_array_decode (void *buf, T &x); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "URL_Array_Helper.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_URL_ARRAY_HELPER_H */ diff --git a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h index 51cde38176e..c8f8712f594 100644 --- a/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h +++ b/ACE/apps/JAWS/server/JAWS_Pipeline_Handler.h @@ -20,8 +20,6 @@ public: // Callback hook for specialized data processing }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS_Pipeline_Handler.cpp" -#endif #endif /* !defined (JAWS_PIPELINE_HANDLER_H) */ diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h index c08d4a6e9d1..1890efb1018 100644 --- a/ACE/apps/JAWS2/JAWS/Assoc_Array.h +++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.h @@ -87,8 +87,6 @@ private: // The next item to be pointed to by iterator. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Assoc_Array.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* !defined (JAWS_ASSOC_ARRAY_H) */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h index d04cf681754..c8272072fdc 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -47,8 +47,6 @@ private: CACHE_BUCKET_MANAGER **hashtable_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_CACHE_HASH_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index b151cf27665..d89f5195055 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -86,8 +86,6 @@ private: size_t heap_idx_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_HEAP_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index 69ac360becb..4be52d0767b 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -95,8 +95,6 @@ private: JAWS_Cache_List_Item *prev_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_LIST_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 5e9e708a53b..36f00c3c273 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -165,8 +165,6 @@ private: Cache_Manager *manager_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Cache_Manager_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHE_MANAGER_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h index 050871ecae7..7ab972e93bc 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h @@ -188,9 +188,6 @@ private: JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_; }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Hash_Bucket_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_HASH_BUCKET_T_H */ diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h index 8ee9db8b6bd..eb757eb92f0 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h @@ -22,8 +22,6 @@ public: // Callback hook for specialized data processing }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "JAWS/Pipeline_Handler_T.cpp" -#endif #endif /* !defined (JAWS_PIPELINE_HANDLER_T_H) */ diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h index e5c04589b45..03f7f795995 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h @@ -83,8 +83,6 @@ private: ACE_TSS_TYPE (JAWS_CACHED_ALLOCATOR(T)) ts_allocator_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "jaws3/Cached_Allocator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CACHED_ALLOCATOR_T_H */ diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h index 5459ed5c09a..2313c737439 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h +++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h @@ -32,8 +32,6 @@ protected: CONCURRENCY_IMPL *impl_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "jaws3/Concurrency_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* JAWS_CONCURRENCY_T_H */ diff --git a/ACE/docs/ACE-guidelines.html b/ACE/docs/ACE-guidelines.html index 0f4e4641785..5d2950c23d5 100644 --- a/ACE/docs/ACE-guidelines.html +++ b/ACE/docs/ACE-guidelines.html @@ -379,9 +379,7 @@ If using g++, problems like this can be flagged as a warning by using the "<code #include "Foo_T.inl" #endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Foo_T.cpp" - #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* FOO_T_H */ </pre></p> diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h index f9cc52bde85..f24577307da 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h @@ -112,9 +112,7 @@ private: #define ACE_INLINE #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_Router.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ #endif /* _PEER_ROUTER_H */ diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h index 70d5abe1edd..56dc447e693 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h @@ -160,8 +160,6 @@ private: int logging_level_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "BPR_Drivers_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* _BPR_DRIVERS_T_H_ */ diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h index 95b62f4bc3f..f3b1a3b7846 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h @@ -22,8 +22,6 @@ private: Reactor_Logging_Server<ACCEPTOR> *server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_Adapter.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* _REACTOR_LOGGING_SERVER_ADAPTER_H */ diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h index 9a2d937ca9d..e21a745ec05 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h @@ -16,8 +16,6 @@ public: ACE_Reactor *reactor); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Reactor_Logging_Server_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* _REACTOR_LOGGING_SERVER_T_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h index f116af38136..7a2eb1a3b00 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h @@ -80,8 +80,6 @@ private: // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-acceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* CPP_ACCEPTOR_H */ diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h index 09cd6103ddc..2f89038ce25 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.h +++ b/ACE/examples/Connection/non_blocking/CPP-connector.h @@ -84,8 +84,6 @@ private: // signal. }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "CPP-connector.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* CPP_CONNECTOR_H */ diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h index 13e5b419445..76c78c9b8ce 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h @@ -63,8 +63,6 @@ protected: extern ACE_Service_Object_Type rts; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Handle_Thr_Stream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_HAS_THREADS */ #endif /* _HANDLE_THR_STREAM_H */ diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h index 4d561cd39ba..ac9d6a98c49 100644 --- a/ACE/examples/Timer_Queue/Driver.h +++ b/ACE/examples/Timer_Queue/Driver.h @@ -128,8 +128,6 @@ protected: Command<RECEIVER, ACTION> *shutdown_cmd_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Driver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* _DRIVER_H_ */ diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h index c3522da4943..ba98f50d34f 100644 --- a/ACE/netsvcs/lib/Base_Optimizer.h +++ b/ACE/netsvcs/lib/Base_Optimizer.h @@ -35,8 +35,6 @@ public: Member m_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Base_Optimizer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* BASE_OPTIMIZER_H */ diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h index b13043aca5a..e98e221cf6a 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.h +++ b/ACE/netsvcs/lib/Log_Message_Receiver.h @@ -198,8 +198,6 @@ private: Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &) = delete; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Log_Message_Receiver.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* LOG_MESSAGE_RECEIVER_H */ diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.h b/ACE/netsvcs/lib/Server_Logging_Handler_T.h index 0ee1bbfd85a..0a6e3804e99 100644 --- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h +++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h @@ -199,8 +199,6 @@ public: virtual int svc (); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Server_Logging_Handler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_SERVER_LOGGING_HANDLER_T_H */ diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h index 07860c72c73..1b5f0e4a76b 100644 --- a/ACE/protocols/ace/INet/BidirStreamBuffer.h +++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h @@ -124,9 +124,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/BidirStreamBuffer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_BIDIR_STREAM_BUFFER_H */ diff --git a/ACE/protocols/ace/INet/BufferedStreamBuffer.h b/ACE/protocols/ace/INet/BufferedStreamBuffer.h index fa209d46ecf..56bae21bb22 100644 --- a/ACE/protocols/ace/INet/BufferedStreamBuffer.h +++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.h @@ -95,9 +95,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/BufferedStreamBuffer.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_BUFFERED_STREAM_BUFFER_H */ diff --git a/ACE/protocols/ace/INet/FTP_Session.h b/ACE/protocols/ace/INet/FTP_Session.h index 8fd4f8521f3..8a218490fde 100644 --- a/ACE/protocols/ace/INet/FTP_Session.h +++ b/ACE/protocols/ace/INet/FTP_Session.h @@ -112,9 +112,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/FTP_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_FTP_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTPS_Session.h b/ACE/protocols/ace/INet/HTTPS_Session.h index 79e5a561c3c..e08d9dd61cd 100644 --- a/ACE/protocols/ace/INet/HTTPS_Session.h +++ b/ACE/protocols/ace/INet/HTTPS_Session.h @@ -86,9 +86,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTPS_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HTTPS_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTP_Session.h b/ACE/protocols/ace/INet/HTTP_Session.h index 4714b831c4f..784f6073373 100644 --- a/ACE/protocols/ace/INet/HTTP_Session.h +++ b/ACE/protocols/ace/INet/HTTP_Session.h @@ -66,9 +66,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_Session.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_SESSION_H */ diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h index d725dbba8d6..ca8c9889b59 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h @@ -85,9 +85,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_StreamPolicy.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_STREAM_POLICY_H */ diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h index b7f48a210be..5f2e1b58097 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h @@ -52,9 +52,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/HTTP_StreamPolicyBase.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_HTTP_STREAM_POLICY_BASE_H */ diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h index 77331900e8d..92d71913636 100644 --- a/ACE/protocols/ace/INet/SSLSock_IOStream.h +++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h @@ -163,9 +163,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/SSLSock_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_SSLSOCK_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h index 5e0b5d27d03..609be0fcedc 100644 --- a/ACE/protocols/ace/INet/Sock_IOStream.h +++ b/ACE/protocols/ace/INet/Sock_IOStream.h @@ -162,9 +162,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/Sock_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_SOCK_IOSTREAM_H */ diff --git a/ACE/protocols/ace/INet/StreamHandler.h b/ACE/protocols/ace/INet/StreamHandler.h index 7913683e408..f2314122f11 100644 --- a/ACE/protocols/ace/INet/StreamHandler.h +++ b/ACE/protocols/ace/INet/StreamHandler.h @@ -137,9 +137,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/StreamHandler.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STREAM_HANDLER_H */ diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h index d55a90759b9..1df803c1142 100644 --- a/ACE/protocols/ace/INet/StreamInterceptor.h +++ b/ACE/protocols/ace/INet/StreamInterceptor.h @@ -59,9 +59,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/StreamInterceptor.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STREAM_INTERCEPTOR_H */ diff --git a/ACE/protocols/ace/INet/String_IOStream.h b/ACE/protocols/ace/INet/String_IOStream.h index d7976323317..f1be7ffa2da 100644 --- a/ACE/protocols/ace/INet/String_IOStream.h +++ b/ACE/protocols/ace/INet/String_IOStream.h @@ -160,9 +160,7 @@ namespace ACE ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/INet/String_IOStream.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_IOS_STRING_IOSTREAM_H */ diff --git a/ACE/tests/STL_algorithm_Test_T.h b/ACE/tests/STL_algorithm_Test_T.h index 68c0113c4b9..0b7a40b0f71 100644 --- a/ACE/tests/STL_algorithm_Test_T.h +++ b/ACE/tests/STL_algorithm_Test_T.h @@ -16,8 +16,6 @@ template <typename T> int test_STL_algorithm (T & container); -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "STL_algorithm_Test_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ACE_TESTS_STL_ALGORITHM_TEST_T_H */ diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 2900d046cc4..caa96561985 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1795,13 +1795,9 @@ TAO_CodeGen::end_server_template_header () // Insert the code to include the template source file. *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"; - *this->server_template_header_ << be_nl << "#include \"" << be_global->be_get_server_template_skeleton_fname (true) << "\""; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED SOURCE */"; // Code to put the last #endif. *this->server_template_header_ << "\n\n"; @@ -1906,12 +1902,9 @@ int TAO_CodeGen::end_ciao_svnt_template_header () { *this->ciao_svnt_template_header_ << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)" - << be_nl << "#include \"" + << "#include \"" << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\"" << be_nl - << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */" - << be_nl; + << "\"" << be_nl; if (be_global->post_include () != nullptr) { diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index f8b0fd60b9b..e045a654000 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -558,8 +558,6 @@ private: long il; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "utl_scope_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif // _UTL_SCOPE_UTL_SCOPE_HH diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h index 77e30015e24..32bfe42a5ae 100644 --- a/TAO/examples/OBV/Simple_util.h +++ b/TAO/examples/OBV/Simple_util.h @@ -149,8 +149,6 @@ protected: int shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h index 76ce3661a25..acb0aa284db 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.h +++ b/TAO/examples/Persistent_Grid/Simple_util.h @@ -144,8 +144,6 @@ protected: Var server_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_UTIL_H */ diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index 841a8aa6a60..d78ad81de95 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -160,8 +160,6 @@ private: int do_shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_UTIL_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index bb139107ba4..a5c3b9f757e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -266,9 +266,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/AV/Endpoint_Strategy_T.cpp" -#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_AV_ENDPOINT_STRATEGY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index 928dbc18f3b..75c57007562 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -91,9 +91,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/AV/Flows_T.cpp" -#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_AV_FLOWS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 17122d7dfe5..16018fe81ab 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -76,9 +76,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Channel_Clients_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Channel_Clients_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* ACE_CHANNEL_CLIENTS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index 0082c8e2e0d..5b194529aeb 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -69,8 +69,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index c22a9f8cd14..9849d2ebc72 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -52,12 +52,8 @@ private: ACE_LOCK lock_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Copy_On_Read.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_COPY_ON_READ_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index d7f565108db..cb866075cbb 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -159,16 +159,12 @@ private: Collection *collection_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Copy_On_Write.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Copy_On_Write.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_COPY_ON_WRITE_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 2b92d32b156..6ff53f19d5c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -132,16 +132,12 @@ private: ACE_Unbounded_Queue<ACE_Command_Base*> command_queue_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Delayed_Changes.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Delayed_Changes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_DELAYED_CHANGES_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index 315215cfbfa..5c9b3ca2867 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -168,16 +168,12 @@ private: Target *target_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Delayed_Command.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Delayed_Command.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_DELAYED_COMMAND_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index 6bea2f83ea7..6928604f89e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -43,16 +43,12 @@ private: ACE_LOCK lock_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Immediate_Changes.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Immediate_Changes.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_IMMEDIATE_CHANGES_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 6a99e69989f..f0608f20666 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -85,12 +85,8 @@ public: virtual void peer_disconnected (PEER *peer); }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Peer_Admin.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_PEER_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index 79bde8b93fb..43cc3b51172 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -83,16 +83,12 @@ private: PEER* peer_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Peer_Workers.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Peer_Workers.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_PEER_WORKERS_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index 72d387c0227..7d9bb87b97c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -135,16 +135,12 @@ private: COUNTED *counted_; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Proxy_Admin.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_Admin.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_PROXY_ADMIN_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index 62b6f5fc1d1..bda7ef87470 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -154,13 +154,9 @@ public: virtual void shutdown () = 0; }; -// **************************************************************** - TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_Collection.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_ESF_PROXY_COLLECTION_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index c8bbea7bd0f..af45c7b9d17 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -74,8 +74,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_List.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_List.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_PROXY_LIST_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index eb30873d71a..b15fd7d612b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -101,8 +101,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_PROXY_RB_TREE_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h index e8b583f6c25..4000763686f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h @@ -66,8 +66,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_PROXY_REFCOUNT_GUARD_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h index 8f7e22ac282..01cd5c88987 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h @@ -54,8 +54,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_RefCount_Guard.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_RefCount_Guard.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_REFCOUNT_GUARD_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index a113c649e9a..a97b81a846a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -38,8 +38,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/ESF/ESF_Shutdown_Proxy.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_SHUTDOWN_PROXY_H */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index fd166be18b0..21c922af928 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -53,8 +53,6 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/ESF/ESF_Worker.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_ESF_WORKER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index b2a11ab2c6e..e6b26cbb72e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -54,9 +54,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_EC_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 88f7f75e216..5f8ab69c0fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -91,8 +91,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Lifetime_Utils_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* EC_LIFETIME_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index 57092849dd6..3dc26fcd924 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -60,9 +60,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h index 9c20ae963c1..8d1444c473e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h @@ -44,8 +44,6 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h index 720d3f21275..10f9477d1c8 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h @@ -35,8 +35,6 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index fc116884a09..e63b7c30acc 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -107,9 +107,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* HTIOP_AccePTOR_IMPL_H */ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 9410ea044a4..e55025ea730 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -101,9 +101,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /*HTIOP_CONNECTOR_IMPL_H*/ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 4c00273e01e..0a43a56355d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -107,9 +107,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp" -#endif /* defined REQUIRED SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 5f09a933cd6..99f7ecfc70c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -117,9 +117,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Naming/Bindings_Iterator_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_BINDINGS_ITERATOR_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index fe87e1d8f04..2538197dee2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -209,9 +209,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Naming/Naming_Service_Container.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* NS_CONTAINERS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 6f4c1312675..b0cc870fae7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -73,9 +73,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Container_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Container_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h index 1262731d014..1f412726da8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h @@ -83,9 +83,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Event_Map_Entry_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Event_Map_Entry_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 31ec6f7dc46..5c2c50ecfe9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -105,9 +105,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Event_Map_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Event_Map_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_EVENT_MAP_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h index e493ba6b127..b7b68c0abc2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h @@ -60,9 +60,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Find_Worker_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Find_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_FIND_WORKER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h index e2f1ae4e754..f68ba7554ac 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h @@ -63,9 +63,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Method_Request_Updates_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Method_Request_Updates_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h index c50d78ad921..48906d32554 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h @@ -77,9 +77,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif // TAO_HAS_MONITOR_FRAMEWORK == 1 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h index 41934c8eaea..284bac2ae8b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h @@ -153,9 +153,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Property_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Property_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROPERTY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 5198ed5b6ce..97bc3f8109c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -54,9 +54,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/ProxyConsumer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXYCONSUMER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h index 01fe9251820..1b0ba52617d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h @@ -92,9 +92,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/ProxySupplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXYSUPPLIER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h index d2864b0a762..2223c35d375 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h @@ -103,9 +103,7 @@ TAO_Notify_Proxy_T<POA_CosEventChannelAdmin::ProxyPushConsumer>; TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Proxy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_PROXY_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h index 65a13698d94..79e1e603c62 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h @@ -39,9 +39,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Reconnect_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h index b17ab8baa27..cdbeabfad9f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h @@ -73,9 +73,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Refcountable_Guard_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Refcountable_Guard_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index 063ceebf6d3..5cabef722fc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -50,9 +50,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Save_Persist_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h index 9c385e5e283..5153b642c29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h @@ -57,9 +57,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Notify/Seq_Worker_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Notify/Seq_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_SEQ_WORKER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h index 411c9a18dfa..ac4cb88da1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h @@ -39,9 +39,7 @@ namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Validate_Worker_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index d0b0eb3b9de..998608bc1a1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -121,9 +121,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) # include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 6ead7c352b7..f1ae68873a7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -489,9 +489,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHED_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 8c3cf498b56..cf97c6a068a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -597,9 +597,7 @@ maintain_scheduling_array (ARRAY_ELEMENT_TYPE ** & current_ptr_array, TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_RECONFIG_SCHEDULER_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h index e4b33dfc15b..a8f32363ce7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h @@ -13,9 +13,7 @@ CORBA::Boolean TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& operand TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Interpreter_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_INTERPRETER_UTILS_T_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index f0f7ff6c27d..c1aa7759070 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -185,9 +185,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Offer_Database.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_SERVICE_TYPE_MAP_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 32e7a17a33b..0401039fe27 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -74,9 +74,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Offer_Iterators_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index fa06efa1c1a..2dd32da8127 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -804,9 +804,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Trader_Interfaces.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index 91f2d0fcc1d..5ba5a9b4465 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -231,9 +231,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Trader/Trader_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h index b6f2325dce0..20f686fdd4a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h @@ -45,8 +45,6 @@ public: #include "Auto_Disconnect.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Auto_Disconnect.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_AUTO_DISCONNECT_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h index 9c69b56917b..2f8206ada5b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h @@ -74,8 +74,6 @@ private: ACE_Thread_Manager thr_mgr_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Low_Priority_Setup.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_LOW_PRIORITY_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h index 52052939f72..179b6c1fff6 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h @@ -27,8 +27,6 @@ public: const char *object_id); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "RIR_Narrow.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_RIR_NARROW_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h index a384cdc1744..76735a54e20 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.h @@ -71,8 +71,6 @@ private: #include "Servant_var.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Servant_var.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_SERVANT_VAR_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h index 379da06b1e5..b50a2195ee4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h @@ -25,8 +25,6 @@ public: #include "Shutdown.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Shutdown.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_SHUTDOWN_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h index 51f65fd5895..46ee61f38cb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Task_Activator.h @@ -76,8 +76,6 @@ protected: #include "Task_Activator.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Task_Activator.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_PERF_RTEC_TASK_ACTIVATOR_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index 48514f0e473..559ed609abe 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -43,9 +43,7 @@ public: TAO_Notify_Tests_Command* create (); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Command_Factory_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_COMMAND_FACTORY_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index b742f881633..8ba7047f528 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -74,9 +74,7 @@ protected: const CosNotification::EventTypeSeq & removed); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Consumer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_CONSUMER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index 6b47e00d622..af5ed4e01ad 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -103,9 +103,7 @@ protected: typename Proxy_Traits::ID proxy_id_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Peer_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_PEER_T_H */ diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index b8a6f609b85..cd580dab358 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -75,9 +75,7 @@ protected: const CosNotification::EventTypeSeq & removed); }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Supplier_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" #endif /* TAO_Notify_Tests_SUPPLIER_T_H */ diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index cd921327d7a..6417e6df24d 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -39,8 +39,6 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_Dynamic.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_SIMPLE_DYNAMIC_H */ diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h index 2a2cf6ce938..61ff56473b8 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h @@ -49,10 +49,7 @@ class ServantList ServantRecordVector servant_records_; }; - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ServantList_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* SERVANTLIST_T_H */ 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" diff --git a/TAO/tests/Alt_Mapping/client.h b/TAO/tests/Alt_Mapping/client.h index 18e366e211c..33e6cfff869 100644 --- a/TAO/tests/Alt_Mapping/client.h +++ b/TAO/tests/Alt_Mapping/client.h @@ -58,8 +58,6 @@ private: Results results_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "client.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* ALT_MAPPING_CLIENT_H */ diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h index b2bf4023e89..b76b6b9e42b 100644 --- a/TAO/tests/Bug_3683_Regression/Simple_util.h +++ b/TAO/tests/Bug_3683_Regression/Simple_util.h @@ -149,7 +149,5 @@ private: int do_shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_UTIL_H */ diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h index 4cbf8dd1e2f..f695221bf61 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h @@ -49,9 +49,6 @@ private: }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ServantList_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - #endif /* SERVANTLIST_T_H */ diff --git a/TAO/tests/DynAny_Test/test_wrapper.h b/TAO/tests/DynAny_Test/test_wrapper.h index cab1995e79f..a2fdecdbd7c 100644 --- a/TAO/tests/DynAny_Test/test_wrapper.h +++ b/TAO/tests/DynAny_Test/test_wrapper.h @@ -36,8 +36,6 @@ private: TEST_OBJECT* test_object_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "test_wrapper.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TEST_WRAPPER_H */ diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h index 616a7df7559..acf966cf5d7 100644 --- a/TAO/tests/OBV/Simple/Simple_util.h +++ b/TAO/tests/OBV/Simple/Simple_util.h @@ -146,7 +146,5 @@ protected: int shutdown_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Simple_util.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* TAO_UTIL_H */ diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h index 7ed3ce7c1b3..40ba33ad9e3 100644 --- a/TAO/tests/Param_Test/client.h +++ b/TAO/tests/Param_Test/client.h @@ -62,7 +62,5 @@ private: Results results_; }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "client.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #endif /* CLIENTS_H */ |