From f25410e018ff6b65ec24df5ba249447f74eb0198 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen
- - ACE is currently supported on AIX 5.2 and higher using IBM's - Visual Age C++ 6 and XL C++ 7 compilers as well as g++ 3.2.
-
- The ace/config-aix-5.x.h
file is recommended for all
- compilers on all AIX 5L versions. The Asynchronous I/O functionality
- is disabled by default because its use requires the system administrator
- to explicitly enable it in the kernel using SMIT. If this has been
- done and you want to enable asynchronous I/O support in ACE, add:
- #define ACE_HAS_AIO_CALLS
to your config.h
- file before including ace/config-aix-5.x.h
.
- - The Visual Age 6.0.0.3 and 6.0.0.4 do have some bugs that makes - them unusable for building TAO. TAO has been tested with 6.0.0.12 and - had no problems with that version.
-
- For your platform_macros.GNU
file, you should use
- platform_aix_ibm.GNU
when building ACE with any of the
- IBM compilers and platform_aix_g++.GNU
when building ACE
- with g++.
- - BTW, here's a technique from Rob Jordan <jordan@hursley.ibm.com> - that can reduce the size of the ACE libraries by about one - third, and can also be applied to applications. It works by - optimising the sharing of template functions, which are created - in an "unusual" way under AIX. It also speeds up - compilation.
- - Here's how to optimise the ACE library generation:
-
- Look at the ace/GNUmakefile.ACE
- in $ACE_ROOT/ace
. Create a file called
- ACE_All_Src.cpp
, and add a line to #include
- each of the source files
- listed under FILES=
in the GNUmakefile. Create a
- file called ACE_All_Tmp.h
- and add a line to #include each of the .h files listed under
- TEMPLATE_FILES=
in the GNUmakefile. Now update the
- GNUmakefile so that
- FILES=ACE_All_Src
and
- TEMPLATE_FILES=ACE_All_Tmp
.
-
ACE has been ported to Linux on
diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h
index ccb663c7d9f..1d6386fa318 100644
--- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h
+++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h
@@ -74,9 +74,5 @@ namespace Kokyu
#include "DSRT_CV_Dispatcher_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DSRT_CV_Dispatcher_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 20452b8ae49..8a1359115dc 100644
--- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
+++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
@@ -80,9 +80,5 @@ namespace Kokyu
#include "DSRT_Direct_Dispatcher_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DSRT_Direct_Dispatcher_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 7a74b8d8437..f0239a406ba 100644
--- a/ACE/Kokyu/DSRT_Dispatch_Item_T.h
+++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.h
@@ -92,9 +92,5 @@ namespace Kokyu
#include "DSRT_Dispatch_Item_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DSRT_Dispatch_Item_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 319ac475991..47c125c525e 100644
--- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h
+++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h
@@ -196,9 +196,5 @@ namespace Kokyu
#include "DSRT_Dispatcher_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DSRT_Dispatcher_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 8953b2a8f38..921ac6eda07 100644
--- a/ACE/Kokyu/DSRT_Sched_Queue_T.h
+++ b/ACE/Kokyu/DSRT_Sched_Queue_T.h
@@ -216,9 +216,5 @@ namespace Kokyu
#include "DSRT_Sched_Queue_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DSRT_Sched_Queue_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 bda65df470c..ddafbd19519 100644
--- a/ACE/Kokyu/Kokyu_dsrt.h
+++ b/ACE/Kokyu/Kokyu_dsrt.h
@@ -161,9 +161,5 @@ namespace Kokyu
#include "Kokyu_dsrt.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Kokyu_dsrt.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* KOKYU_DSRT_H */
diff --git a/ACE/NEWS b/ACE/NEWS
index 5b60c3b2f34..9f3517e9825 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,7 +1,7 @@
USER VISIBLE CHANGES BETWEEN ACE-7.0.11 and ACE-7.1.0
=====================================================
-. Removed support for Windows CE, OpenVMS, HPUX, and RTEMS
+. Removed support for Windows CE, OpenVMS, HPUX, AIX, and RTEMS
USER VISIBLE CHANGES BETWEEN ACE-7.0.10 and ACE-7.0.11
======================================================
diff --git a/ACE/README b/ACE/README
index 44bde74e895..88bf82d60af 100644
--- a/ACE/README
+++ b/ACE/README
@@ -18,7 +18,7 @@ The ADAPTIVE Communication Environment (ACE) is an object-oriented
communication software. ACE provides a rich set of reusable C++
wrappers and frameworks that perform common communication software
tasks across a range of OS platforms, including Win32/Win64, most
-versions of UNIX (e.g., SunOS, HP-UX , AIX, Linux, NetBSD, and FreeBSD),
+versions of UNIX (e.g., SunOS, Linux, NetBSD, and FreeBSD),
real-time operating systems (e.g., VxWorks, Chorus, LynxOS, and QNX),
and MVS OpenEdition. A single source tree is used for all
these platforms and porting ACE to other platforms is relatively easy.
diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h
index f45f176a97c..50e43905185 100644
--- a/ACE/ace/ARGV.h
+++ b/ACE/ace/ARGV.h
@@ -324,9 +324,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/ARGV.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ARGV.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 cd17f28d0ef..a67a1d43190 100644
--- a/ACE/ace/Abstract_Timer_Queue.h
+++ b/ACE/ace/Abstract_Timer_Queue.h
@@ -222,9 +222,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Abstract_Timer_Queue.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Abstract_Timer_Queue.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_ABSTRACT_TIMER_QUEUE_H */
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index e0dc84ee258..7dc9deaf300 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -688,10 +688,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Acceptor.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Acceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_ACCEPTOR_H */
diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h
index 78dd7a3f991..513f42ccfdc 100644
--- a/ACE/ace/Active_Map_Manager_T.h
+++ b/ACE/ace/Active_Map_Manager_T.h
@@ -196,9 +196,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Active_Map_Manager_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Active_Map_Manager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 547d772e12d..32d792d9875 100644
--- a/ACE/ace/Arg_Shifter.h
+++ b/ACE/ace/Arg_Shifter.h
@@ -230,10 +230,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Arg_Shifter.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Arg_Shifter.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_ARG_SHIFTER_H */
diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h
index c2020aae474..33ccbd01d0b 100644
--- a/ACE/ace/Array_Base.h
+++ b/ACE/ace/Array_Base.h
@@ -240,10 +240,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Array_Base.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Array_Base.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_ARRAY_BASE_H */
diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h
index 4feefe97066..64593cdb701 100644
--- a/ACE/ace/Array_Map.h
+++ b/ACE/ace/Array_Map.h
@@ -291,10 +291,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# include "ace/Array_Map.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Array_Map.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_ARRAY_MAP_H */
diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h
index 7760ba53d5c..5354fde8d6c 100644
--- a/ACE/ace/Asynch_Acceptor.h
+++ b/ACE/ace/Asynch_Acceptor.h
@@ -264,10 +264,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Asynch_Acceptor.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Asynch_Acceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* ACE_HAS_WIN32_OVERLAPPED_IO || ACE_HAS_AIO_CALLS */
#include /**/ "ace/post.h"
#endif /* ACE_ASYNCH_ACCEPTOR_H */
diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h
index dca8a9aef3d..f2790657583 100644
--- a/ACE/ace/Asynch_Connector.h
+++ b/ACE/ace/Asynch_Connector.h
@@ -158,10 +158,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Asynch_Connector.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Asynch_Connector.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
#include /**/ "ace/post.h"
#endif /* ACE_ASYNCH_CONNECTOR_H */
diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h
index 13d363163ea..3855803a448 100644
--- a/ACE/ace/Atomic_Op_GCC_T.h
+++ b/ACE/ace/Atomic_Op_GCC_T.h
@@ -124,11 +124,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Atomic_Op_GCC_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Atomic_Op_GCC_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#endif /* ACE_HAS_GCC_ATOMIC_BUILTINS */
#include /**/ "ace/post.h"
diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h
index 599ae7075b6..9cd9f49b7dd 100644
--- a/ACE/ace/Atomic_Op_T.h
+++ b/ACE/ace/Atomic_Op_T.h
@@ -348,9 +348,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Atomic_Op_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Atomic_Op_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 324eb20ad25..707f6a0813b 100644
--- a/ACE/ace/Auto_Event.h
+++ b/ACE/ace/Auto_Event.h
@@ -96,9 +96,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Auto_Event.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Auto_Event.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_AUTO_EVENT_H */
diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h
index dde2b427a93..f7c10f7a00d 100644
--- a/ACE/ace/Auto_IncDec_T.h
+++ b/ACE/ace/Auto_IncDec_T.h
@@ -69,10 +69,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Auto_IncDec_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Auto_IncDec_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_AUTO_INCDEC_T_H */
diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h
index 01236ce8198..6897e82feb7 100644
--- a/ACE/ace/Auto_Ptr.h
+++ b/ACE/ace/Auto_Ptr.h
@@ -196,10 +196,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Auto_Ptr.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Auto_Ptr.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if defined (_MSC_VER)
// Restore the warning state to what it was before entry.
# pragma warning(pop)
diff --git a/ACE/ace/Based_Pointer_T.h b/ACE/ace/Based_Pointer_T.h
index 902e90f2a36..79f8df104a1 100644
--- a/ACE/ace/Based_Pointer_T.h
+++ b/ACE/ace/Based_Pointer_T.h
@@ -180,10 +180,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Based_Pointer_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Based_Pointer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_BASED_POINTER_T_H */
diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h
index 0464ef030dd..dcbe4b1e753 100644
--- a/ACE/ace/Bound_Ptr.h
+++ b/ACE/ace/Bound_Ptr.h
@@ -370,10 +370,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Bound_Ptr.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Bound_Ptr.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_BOUND_PTR_H */
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index 277f3d0779d..be7828165f5 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -264,7 +264,7 @@ public:
// VxWorks' compiler (gcc 2.96) gets confused by the operator long
// double, so we avoid using long double as the NativeImpl.
// Linux's x86 long double format (12 or 16 bytes) is incompatible
- // with Windows, Solaris, AIX, and MacOS X (and probably others)
+ // with Windows, Solaris, and MacOS X (and probably others)
// long double format (8 or 16 bytes). If you need 32-bit Linux to
// inter-operate with 64-bit Linux you will want to define this
// macro to 0 so that "long double" is used. Otherwise, do not define
diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h
index 10490c2167e..4f7d3473f6a 100644
--- a/ACE/ace/Cache_Map_Manager_T.h
+++ b/ACE/ace/Cache_Map_Manager_T.h
@@ -388,10 +388,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Cache_Map_Manager_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cache_Map_Manager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_CACHE_MAP_MANAGER_T_H */
diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index dd7ac7d3da2..2788d808506 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -251,9 +251,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Cached_Connect_Strategy_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cached_Connect_Strategy_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 7cbad12d5d8..c3741ce4e30 100644
--- a/ACE/ace/Caching_Strategies_T.h
+++ b/ACE/ace/Caching_Strategies_T.h
@@ -542,10 +542,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Caching_Strategies_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Caching_Strategies_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_CACHING_STRATEGIES_H */
diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h
index a8d4755541b..24903b8dbd9 100644
--- a/ACE/ace/Caching_Utility_T.h
+++ b/ACE/ace/Caching_Utility_T.h
@@ -292,10 +292,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Caching_Utility_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Caching_Utility_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_CACHING_UTILITY_H */
diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h
index 65a67cb3143..4abd3a1246f 100644
--- a/ACE/ace/Cleanup_Strategies_T.h
+++ b/ACE/ace/Cleanup_Strategies_T.h
@@ -134,9 +134,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Cleanup_Strategies_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cleanup_Strategies_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* CLEANUP_STRATEGIES_H */
diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h
index 34523edb875..d460075e63d 100644
--- a/ACE/ace/Condition_T.h
+++ b/ACE/ace/Condition_T.h
@@ -156,10 +156,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Condition_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Condition_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* ACE_HAS_THREADS */
#include /**/ "ace/post.h"
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 11617eeb870..673d1d8455e 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -568,10 +568,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Connector.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Connector.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_CONNECTOR_H */
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index d52a970921a..1d9a03d92f7 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -2023,10 +2023,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Containers_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Containers_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_CONTAINERS_T_H */
diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h
index d3817db8c44..5dc11013c0e 100644
--- a/ACE/ace/Countdown_Time_T.h
+++ b/ACE/ace/Countdown_Time_T.h
@@ -93,9 +93,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Countdown_Time_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Countdown_Time_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#endif /* ACE_COUNTDOWN_TIME_T_H */
diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 69f2c787c4a..ec1a2a0e1b2 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -123,44 +123,6 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name,
{
if (this->open_i (name->c_str (), open_mode, errors))
break;
-
-#if defined (AIX)
-# define SHR_O ACE_TEXT("(shr.o)")
-# define SHR_O_LEN (sizeof (SHR_O) / sizeof(ACE_TCHAR) - 1)
- // AIX often puts the shared library file (most often named
- // shr.o) inside an archive library. If this is an archive
- // library name, then try appending [shr.o] and retry.
- if (ACE_TString::npos != name->strstr (ACE_TEXT (".a")))
- {
- ACE_TCHAR aix_pathname[MAXPATHLEN + 1];
- if (name->length () + SHR_O_LEN <= MAXPATHLEN)
- {
- ACE_OS::strcpy (aix_pathname, name->c_str());
- ACE_OS::strcat (aix_pathname, SHR_O);
- }
- else
- {
- if (errors)
- {
- errors->push ("path is too long");
- }
-
- if (ACE::debug ())
- {
- ACELIB_ERROR ((LM_ERROR,
- ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: ")
- ACE_TEXT ("('%s(shr.o)') is too long\n"),
- name->c_str()));
- }
-
- return -1;
- }
- open_mode |= RTLD_MEMBER;
-
- if (this->open_i (aix_pathname, open_mode, errors))
- break;
- }
-#endif /* AIX */
}
if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h
index ead87898acf..c791f476d18 100644
--- a/ACE/ace/Dump_T.h
+++ b/ACE/ace/Dump_T.h
@@ -72,9 +72,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Dump_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Dump_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_DUMP_T_H */
diff --git a/ACE/ace/Dynamic_Service.h b/ACE/ace/Dynamic_Service.h
index 713a5aac98f..5f99474b72a 100644
--- a/ACE/ace/Dynamic_Service.h
+++ b/ACE/ace/Dynamic_Service.h
@@ -78,10 +78,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# include "ace/Dynamic_Service.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-# pragma implementation ("Dynamic_Service.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_DYNAMIC_SERVICE_H */
diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h
index 6e97e3602d7..99ed94690d3 100644
--- a/ACE/ace/Env_Value_T.h
+++ b/ACE/ace/Env_Value_T.h
@@ -151,9 +151,5 @@ ACE_Convert (const ACE_TCHAR *s, T &t)
ACE_END_VERSIONED_NAMESPACE_DECL
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Env_Value_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_ENV_VALUE_T_H */
diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h
index 78682631d9d..314fd3398d2 100644
--- a/ACE/ace/Event.h
+++ b/ACE/ace/Event.h
@@ -81,9 +81,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Event.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Event.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 a222459388e..15dd2d720bc 100644
--- a/ACE/ace/Event_Handler_T.h
+++ b/ACE/ace/Event_Handler_T.h
@@ -177,9 +177,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Event_Handler_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Event_Handler_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 a4e7d4ee356..fd9ae43fffb 100644
--- a/ACE/ace/Framework_Component_T.h
+++ b/ACE/ace/Framework_Component_T.h
@@ -61,9 +61,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Framework_Component_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Framework_Component_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 38e30e6c1b0..a71f99c204c 100644
--- a/ACE/ace/Free_List.h
+++ b/ACE/ace/Free_List.h
@@ -141,9 +141,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Free_List.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Free_List.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_FREE_LIST_H */
diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h
index efa33f879b6..2c26f645c0d 100644
--- a/ACE/ace/Functor_T.h
+++ b/ACE/ace/Functor_T.h
@@ -184,9 +184,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Functor_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Functor_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_FUNCTOR_T_H */
diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h
index 4858bcad6f8..092682752ec 100644
--- a/ACE/ace/Future.h
+++ b/ACE/ace/Future.h
@@ -366,10 +366,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Future.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Future.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* ACE_HAS_THREADS */
#include /**/ "ace/post.h"
diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h
index abee861e31c..2d43f193730 100644
--- a/ACE/ace/Future_Set.h
+++ b/ACE/ace/Future_Set.h
@@ -130,10 +130,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Future_Set.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Future_Set.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* ACE_HAS_THREADS */
#include /**/ "ace/post.h"
#endif /* ACE_FUTURE_SET_H */
diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h
index d7ffa9cd7af..b95fb142ef6 100644
--- a/ACE/ace/Guard_T.h
+++ b/ACE/ace/Guard_T.h
@@ -382,9 +382,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Guard_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Guard_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_GUARD_T_H */
diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl
index 60e31a21a9c..49fb76559a3 100644
--- a/ACE/ace/Handle_Set.inl
+++ b/ACE/ace/Handle_Set.inl
@@ -1,7 +1,6 @@
// -*- C++ -*-
#include "ace/Log_Category.h"
-// AIX defines bzero() in this odd file... used by FD_ZERO
#if defined (ACE_HAS_STRINGS)
# include "ace/os_include/os_strings.h"
#endif /* ACE_HAS_STRINGS */
diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h
index e8abfbcb464..fa6127e63ca 100644
--- a/ACE/ace/Hash_Cache_Map_Manager_T.h
+++ b/ACE/ace/Hash_Cache_Map_Manager_T.h
@@ -200,10 +200,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Hash_Cache_Map_Manager_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Hash_Cache_Map_Manager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* HASH_CACHE_MAP_MANAGER_T_H */
diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h
index 6960498bfe7..5b15ab8dde4 100644
--- a/ACE/ace/Hash_Map_Manager_T.h
+++ b/ACE/ace/Hash_Map_Manager_T.h
@@ -1285,9 +1285,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Hash_Map_Manager_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Hash_Map_Manager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 21eaec5f6ba..7636acca610 100644
--- a/ACE/ace/Hash_Map_With_Allocator_T.h
+++ b/ACE/ace/Hash_Map_With_Allocator_T.h
@@ -101,10 +101,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Hash_Map_With_Allocator_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Hash_Map_With_Allocator_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#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 c3e446e1876..ba3651084ef 100644
--- a/ACE/ace/Hash_Multi_Map_Manager_T.h
+++ b/ACE/ace/Hash_Multi_Map_Manager_T.h
@@ -950,9 +950,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Hash_Multi_Map_Manager_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Hash_Multi_Map_Manager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_HASH_MULTI_MAP_MANAGER_T_H */
diff --git a/ACE/ace/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h
index ff4d544159b..154201bbf1a 100644
--- a/ACE/ace/High_Res_Timer.h
+++ b/ACE/ace/High_Res_Timer.h
@@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
*
* @brief A high resolution timer class wrapper that encapsulates
* OS-specific high-resolution timers, such as those found on
- * Solaris, AIX, Win32/Pentium, and VxWorks.
+ * Solaris, Win32/Pentium, and VxWorks.
*
* Most of the member functions don't return values. The only
* reason that one would fail is if high-resolution time isn't
diff --git a/ACE/ace/IOStream_T.h b/ACE/ace/IOStream_T.h
index c65a42a18b5..9034b5e4129 100644
--- a/ACE/ace/IOStream_T.h
+++ b/ACE/ace/IOStream_T.h
@@ -274,10 +274,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# include "ace/IOStream_T.cpp"
# endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-# if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-# pragma implementation ("IOStream_T.cpp")
-# endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-#endif /* ACE_LACKS_ACE_IOSTREAM */
-
#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 7757e6d5c0c..86ebe780aec 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -144,10 +144,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Intrusive_Auto_Ptr.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_Auto_Ptr.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_INTRUSIVE_AUTO_PTR_H */
diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h
index c5017cd730c..a6455ae7ff1 100644
--- a/ACE/ace/Intrusive_List.h
+++ b/ACE/ace/Intrusive_List.h
@@ -128,9 +128,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Intrusive_List.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_List.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 8fe5c40b205..f834f3ba67f 100644
--- a/ACE/ace/Intrusive_List_Node.h
+++ b/ACE/ace/Intrusive_List_Node.h
@@ -74,9 +74,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Intrusive_List_Node.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_List_Node.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 b4e099ba285..298bc5ea097 100644
--- a/ACE/ace/LOCK_SOCK_Acceptor.h
+++ b/ACE/ace/LOCK_SOCK_Acceptor.h
@@ -57,9 +57,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/LOCK_SOCK_Acceptor.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("LOCK_SOCK_Acceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 6a65c22448e..fc811bfdb72 100644
--- a/ACE/ace/Local_Name_Space_T.h
+++ b/ACE/ace/Local_Name_Space_T.h
@@ -258,9 +258,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Local_Name_Space_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Local_Name_Space_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 360f2d02479..4ad62bbb9b0 100644
--- a/ACE/ace/Lock_Adapter_T.h
+++ b/ACE/ace/Lock_Adapter_T.h
@@ -111,9 +111,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Lock_Adapter_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Lock_Adapter_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 c519caff0ed..31d5b8006c5 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -885,9 +885,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/Malloc_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Malloc_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_MALLOC_H */
diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h
index c038a617167..ee9b7464da8 100644
--- a/ACE/ace/Managed_Object.h
+++ b/ACE/ace/Managed_Object.h
@@ -100,6 +100,9 @@ template
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index 17ae8c06a62..f9cc52bde85 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -116,9 +116,5 @@ private:
#include "Peer_Router.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Peer_Router.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 931ec9ea65c..70d5abe1edd 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h
@@ -164,8 +164,4 @@ private:
#include "BPR_Drivers_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BPR_Drivers_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 b4839beb648..95b62f4bc3f 100644
--- a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h
+++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.h
@@ -26,8 +26,4 @@ private:
#include "Reactor_Logging_Server_Adapter.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reactor_Logging_Server_Adapter.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 2df69c8bb04..9a2d937ca9d 100644
--- a/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h
+++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_T.h
@@ -20,8 +20,4 @@ public:
#include "Reactor_Logging_Server_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reactor_Logging_Server_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 e01d505a8ec..f116af38136 100644
--- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h
+++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h
@@ -84,8 +84,4 @@ private:
#include "CPP-acceptor.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CPP-acceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 8bc322a058d..09cd6103ddc 100644
--- a/ACE/examples/Connection/non_blocking/CPP-connector.h
+++ b/ACE/examples/Connection/non_blocking/CPP-connector.h
@@ -88,8 +88,4 @@ private:
#include "CPP-connector.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CPP-connector.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* CPP_CONNECTOR_H */
diff --git a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h
index d01985ce0da..97da10749c1 100644
--- a/ACE/examples/Shared_Malloc/test_position_independent_malloc.h
+++ b/ACE/examples/Shared_Malloc/test_position_independent_malloc.h
@@ -1,6 +1,5 @@
//
-// Define struct used in test_position_independent_malloc.cpp - needs
-// to be in a separate file for template generation on AIX IBM C++.
+// Define struct used in test_position_independent_malloc.cpp
#ifndef __TEST_POSITION_INDEPENDENT_MALLOC_H
#define __TEST_POSITION_INDEPENDENT_MALLOC_H
diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h
index d19f4015e73..4d561cd39ba 100644
--- a/ACE/examples/Timer_Queue/Driver.h
+++ b/ACE/examples/Timer_Queue/Driver.h
@@ -132,8 +132,4 @@ protected:
#include "Driver.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Driver.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* _DRIVER_H_ */
diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
index f3988c7db69..bd147cc8746 100644
--- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU
+++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU
@@ -80,11 +80,7 @@ templates ?= automatic
versioned_so ?= 1
with_ld ?=
ifneq ($(versioned_so),0)
- ifeq ($(with_ld),aix)
- # What to do here???
- else
- SOFLAGS += -Wl,-h -Wl,$(SONAME)
- endif
+ SOFLAGS += -Wl,-h -Wl,$(SONAME)
endif
ifeq ($(versioned_so),2)
diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU
index 9fb934580cb..3da9b1b5eaa 100644
--- a/ACE/include/makeinclude/rules.bin.GNU
+++ b/ACE/include/makeinclude/rules.bin.GNU
@@ -1,7 +1,7 @@
# -*- Makefile -*-
#----------------------------------------------------------------------------
-#
+#
#
# Build binaries
# GNU version
@@ -35,18 +35,12 @@ PSRC += $(addsuffix .cpp, $(CLEANUP_BIN))
CLEANUP_INSTALL += $(CLEANUP_BIN:%=$(INSBIN)/%$(VAR)$(EXEEXT))
VXWORKSLINK ?=
-using_aix_vacpp ?=
ifeq ($(VXWORKSLINK),1)
$(ARCH_BIN): $(DEFAULTRULE)
mv $(DEFAULTRULE) $@
else # !VXWORKSLINK
- ifeq (1,$(using_aix_vacpp))
-$(ARCH_BIN): %: %.icc $(SRC)
- vacbld_r $< -severitylevel=warning
- else # !using_aix_vacpp
# Since we add in the vdir, don't use arch_bin. use bin instead!
$(ARCH_BIN): %: $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)
$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$(BIN).$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK)
- endif # using_aix_vacpp
endif
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 82b423c4284..6b8c2e8fc13 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -137,7 +137,6 @@ ifneq ($(INSLIB),)
endif # INSLIB
ace_lib_prelink ?= 0
-aix_build ?= 0
ifeq (1,$(VXWORKS))
@@ -192,16 +191,6 @@ $(VLIB): $(VLOBJS)
else
([ "`echo $(TMPINCDIR:%=%/*.$(OBJEXT))`" != "$(TMPINCDIR:%=%/*.$(OBJEXT))" ] && echo $(TMPINCDIR:%=%/*.$(OBJEXT)); \
echo $(filter %.$(OBJEXT), $^)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
- endif
- ifdef ibmcxx_build
-# This is required to get AIX IBM C/C++ to instantiate and compile the needed
-# templates.
- if test -s ./$(TEMPINCDIR)/*.C; \
- then \
- $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \
- $(RM) dummy; \
- $(AR) $(ARFLAGS) $@ $(TEMPINCDIR)/*.$(OBJEXT); \
- fi
endif
-chmod a+r $@
ifneq (,$(RANLIB))
@@ -210,55 +199,19 @@ $(VLIB): $(VLOBJS)
endif # !VXWORKS
-# Note that if you don't want to build shared libraries, just remove the
-# $(VSHOBJS)
-#
-# The AIX shr.o build is out here to keep it away from the SOVERSION stuff.
-# The SOVERSION transform is applied after building the library file.
-ifeq (1,$(aix_build))
-shr.o: $(VSHOBJS)
- $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
-
-.INTERMEDIATE: shr.o
-endif # aix_build
-
ifeq ($(VXWORKSLINK),1)
$(VSHLIB): $(basename $(notdir $(PRJ_FILE))).out
-$(RM) $@
-$(LN_S) $(PROJECT_OUT) $@
-$(POST_BUILD_RULE)
else # !VXWORKSLINK
- ifeq (1,$(aix_build))
-$(VSHLIB): shr.o
- $(AR) $(ARFLAGS) $@ $?
- ifneq (,$(RANLIB))
- -$(RANLIB) $@
- endif # RANLIB
- else # ! aix_build
$(VSHLIB): $(VSHOBJS)
- ifdef PRELIB
+ ifdef PRELIB
$(PRELIB)
- endif # PRELIB
- ifdef ibmcxx_build
- # This is required to get AIX IBM C/C++ to instantiate and compile the needed
- # templates before building the library.
- if test -s ./$(TEMPINCDIR)/*.C; \
- then \
- $(LINK.cc) $(LINK_OUTPUT_FLAG) dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(ACE_SHLIBS) $(LIBS); \
- $(RM) dummy; \
- fi
- endif # ibmcxx_build
- ifdef SHLIBBUILD
+ endif # PRELIB
+ ifdef SHLIBBUILD
$(SHLIBBUILD)
else # ! SHLIBBUILD
- ifdef ibmcxx_build
- if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \
- then \
- $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \
- else \
- $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \
- fi
- else # !ibmcxx_build
ifeq (1,$(ace_lib_prelink))
#### Attempt a link (which will fail), to add template instantiations
#### to lib files, for example.
@@ -269,9 +222,7 @@ $(VSHLIB): $(VSHOBJS)
else
$(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $^ $(LDFLAGS) $(ACE_SHLIBS) $(LIBS)
endif #override
- endif # ibmcxx_build
- endif # SHLIBBUILD
- endif # aix_build
+ endif # SHLIBBUILD
endif # VXWORKSLINK
ifneq ($(SOVERSION),)
# This carefully works with both ARCH (where VSHLIB_* refer to the ARCH
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index f9888281467..3677eac5917 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -224,7 +224,6 @@ endif # alternate_platform_macros
# Define some variables to silence warnings
GHS ?=
-AIX_TEMPLATE_HACK ?=
# $(ACE_PLATFORM_CONFIG) is used in dependency rules and corresponds to the
# platform dependent config-*.h file included in config.h, and can be set
diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h
index f4a648f09b3..c3522da4943 100644
--- a/ACE/netsvcs/lib/Base_Optimizer.h
+++ b/ACE/netsvcs/lib/Base_Optimizer.h
@@ -39,8 +39,4 @@ public:
#include "Base_Optimizer.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Base_Optimizer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* BASE_OPTIMIZER_H */
diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h
index 30b9cbf0d9d..b13043aca5a 100644
--- a/ACE/netsvcs/lib/Log_Message_Receiver.h
+++ b/ACE/netsvcs/lib/Log_Message_Receiver.h
@@ -202,8 +202,4 @@ private:
#include "Log_Message_Receiver.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Log_Message_Receiver.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 69d9572b239..0ee1bbfd85a 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h
@@ -203,8 +203,4 @@ public:
#include "Server_Logging_Handler_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Server_Logging_Handler_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* ACE_SERVER_LOGGING_HANDLER_T_H */
diff --git a/ACE/performance-tests/Misc/test_singleton.h b/ACE/performance-tests/Misc/test_singleton.h
index 5c6e349f98f..e9ae536359f 100644
--- a/ACE/performance-tests/Misc/test_singleton.h
+++ b/ACE/performance-tests/Misc/test_singleton.h
@@ -1,6 +1,4 @@
-// Define the DC_Singleton here - it needs to be in a separate file to
-// get picked up correctly on AIX with auto template instantiation using
-// IBM C++ compiler (xlC).
+// Define the DC_Singleton here
#ifndef __TEST_SINGLETON_H
#define __TEST_SINGLETON_H
diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h
index 61306083a9d..07860c72c73 100644
--- a/ACE/protocols/ace/INet/BidirStreamBuffer.h
+++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h
@@ -128,9 +128,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/BidirStreamBuffer.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BidirStreamBuffer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 4bb2a5c394b..fa209d46ecf 100644
--- a/ACE/protocols/ace/INet/BufferedStreamBuffer.h
+++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.h
@@ -99,9 +99,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/BufferedStreamBuffer.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BufferedStreamBuffer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 787877cee8e..8fd4f8521f3 100644
--- a/ACE/protocols/ace/INet/FTP_Session.h
+++ b/ACE/protocols/ace/INet/FTP_Session.h
@@ -116,9 +116,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/FTP_Session.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("FTP_Session.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 51f0132c530..79e5a561c3c 100644
--- a/ACE/protocols/ace/INet/HTTPS_Session.h
+++ b/ACE/protocols/ace/INet/HTTPS_Session.h
@@ -90,9 +90,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/HTTPS_Session.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTPS_Session.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 ef45d3006e5..4714b831c4f 100644
--- a/ACE/protocols/ace/INet/HTTP_Session.h
+++ b/ACE/protocols/ace/INet/HTTP_Session.h
@@ -70,9 +70,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/HTTP_Session.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTP_Session.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 73e15241500..d725dbba8d6 100644
--- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
+++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
@@ -89,9 +89,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/HTTP_StreamPolicy.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTP_StreamPolicy.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 a305492f59a..b7f48a210be 100644
--- a/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h
+++ b/ACE/protocols/ace/INet/HTTP_StreamPolicyBase.h
@@ -56,9 +56,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/HTTP_StreamPolicyBase.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTTP_StreamPolicyBase.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 f97887a9e1d..77331900e8d 100644
--- a/ACE/protocols/ace/INet/SSLSock_IOStream.h
+++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h
@@ -167,9 +167,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/SSLSock_IOStream.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("SSLSock_IOStream.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 ddd101c7453..5e0b5d27d03 100644
--- a/ACE/protocols/ace/INet/Sock_IOStream.h
+++ b/ACE/protocols/ace/INet/Sock_IOStream.h
@@ -166,9 +166,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/Sock_IOStream.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Sock_IOStream.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 2a680d61450..7913683e408 100644
--- a/ACE/protocols/ace/INet/StreamHandler.h
+++ b/ACE/protocols/ace/INet/StreamHandler.h
@@ -141,9 +141,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/StreamHandler.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("StreamHandler.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 e71cda5c94f..d55a90759b9 100644
--- a/ACE/protocols/ace/INet/StreamInterceptor.h
+++ b/ACE/protocols/ace/INet/StreamInterceptor.h
@@ -63,9 +63,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/StreamInterceptor.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("StreamInterceptor.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 508852317d9..d7976323317 100644
--- a/ACE/protocols/ace/INet/String_IOStream.h
+++ b/ACE/protocols/ace/INet/String_IOStream.h
@@ -164,9 +164,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
#include "ace/INet/String_IOStream.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("String_IOStream.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* ACE_IOS_STRING_IOSTREAM_H */
diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp
index 7b7d2828a43..dd960c75843 100644
--- a/ACE/tests/Auto_Event_Test.cpp
+++ b/ACE/tests/Auto_Event_Test.cpp
@@ -22,7 +22,7 @@
#include "ace/Atomic_Op.h"
// msec that times are allowed to differ before test fails.
-#if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \
+#if defined (ACE_HAS_HI_RES_TIMER) || \
defined (ACE_HAS_PENTIUM) || \
defined (ACE_HAS_POWERPC_TIMER)
# define ACE_ALLOWED_SLACK 100
diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h
index 250c8283c25..80cefeff78c 100644
--- a/ACE/tests/Bound_Ptr_Test.h
+++ b/ACE/tests/Bound_Ptr_Test.h
@@ -3,8 +3,7 @@
/**
* @file Bound_Ptr_Test.h
*
- * Define class needed for generating templates. IBM C++ requires this to
- * be in its own file for auto template instantiation.
+ * Define class needed for generating templates.
*
* @author @author Christopher Kohlhoff
Partially supported, i.e., infrequently tested
- Solaris 9, FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian), and AIX 5.x
+ Solaris 9, FreeBSD, NetBSD, MacOSX, Linux/Alpha (RedHat, SuSE, and Debian)
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 715ce0199e2..2900d046cc4 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1803,16 +1803,6 @@ TAO_CodeGen::end_server_template_header ()
*this->server_template_header_ << be_nl
<< "#endif /* defined REQUIRED SOURCE */";
- // Insert the code to include the template pragma.
- *this->server_template_header_
- << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)";
- *this->server_template_header_
- << be_nl << "#pragma implementation (\""
- << be_global->be_get_server_template_skeleton_fname (true)
- << "\")";
- *this->server_template_header_ << be_nl
- << "#endif /* defined REQUIRED PRAGMA */";
-
// Code to put the last #endif.
*this->server_template_header_ << "\n\n";
@@ -1921,12 +1911,6 @@ TAO_CodeGen::end_ciao_svnt_template_header ()
<< be_global->be_get_ciao_tmpl_svnt_src_fname (true)
<< "\"" << be_nl
<< "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */"
- << be_nl_2
- << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"
- << be_nl << "#pragma implementation (\""
- << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
- << "\")"
- << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */"
<< be_nl;
if (be_global->post_include () != nullptr)
@@ -2768,7 +2752,6 @@ TAO_CodeGen::gen_stub_src_includes ()
if (be_global->gen_amh_classes ())
{
- // Necessary for the AIX compiler.
this->gen_standard_include (this->client_stubs_,
"ace/Auto_Ptr.h");
}
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 62064434224..295b8906ba2 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -73,9 +73,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "ace/SString.h"
#include "ace/Vector_T.h"
-// This is for AIX w/IBM C++
class Identifier;
-
class UTL_Scope;
class UTL_String;
class ast_visitor;
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index 697c03e1e08..f8b0fd60b9b 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -81,9 +81,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "fe_utils.h"
-// This is for AIX w/IBM C++.
class Identifier;
-
class AST_PredefinedType;
class AST_Module;
class AST_Template_Module_Inst;
@@ -564,8 +562,4 @@ private:
#include "utl_scope_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("utl_scope_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif // _UTL_SCOPE_UTL_SCOPE_HH
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 839b4ceb58c..2662416ea8f 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -1013,7 +1013,7 @@ having them use the same configurator file.
been detected that a connection is closed when reading a server reply
and having the server possibly process the reqest more than once
is acceptable. This option currently does not work under FreeBSD,
- AIX, and Solaris.
+ and Solaris.
The number of retries will not exceed limit.
If this option is used then -ORBForwardOnTransientLimit should
also be used to avoid a TRANSIENT exception being thrown.
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 30b9d2fe8ee..77e30015e24 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -152,8 +152,5 @@ protected:
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index d9272e1fe0c..76ce3661a25 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -147,8 +147,5 @@ protected:
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 51319b172f1..841a8aa6a60 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -163,8 +163,5 @@ private:
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#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 e4e93dd5ba5..bb139107ba4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -270,9 +270,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/AV/Endpoint_Strategy_T.cpp"
#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Endpoint_Strategy_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 f2a0fc87f9c..928dbc18f3b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -95,9 +95,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/AV/Flows_T.cpp"
#endif /*ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Flows_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 9f2baab57a9..17122d7dfe5 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -80,9 +80,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Channel_Clients_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Channel_Clients_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 b7cc48b1a54..0082c8e2e0d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -73,8 +73,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Busy_Lock.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Busy_Lock.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 36578eb57e5..c22a9f8cd14 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -60,8 +60,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Copy_On_Read.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Copy_On_Read.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 dddaf15ebc8..d7f565108db 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -171,8 +171,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Copy_On_Write.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Copy_On_Write.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 c3e9f8e40d0..2b92d32b156 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -144,8 +144,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Delayed_Changes.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Delayed_Changes.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 7add098ca40..315215cfbfa 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
@@ -180,8 +180,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Delayed_Command.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Delayed_Command.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 5f46da59d2a..6bea2f83ea7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -55,8 +55,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Immediate_Changes.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Immediate_Changes.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 0ba8c9eeb56..6a99e69989f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -93,8 +93,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Peer_Admin.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Peer_Admin.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 d8b48b1ab57..79bde8b93fb 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -95,8 +95,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Peer_Workers.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Peer_Workers.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 4c40bd9d446..72d387c0227 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -147,8 +147,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Proxy_Admin.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Proxy_Admin.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 b486e13f02f..62b6f5fc1d1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -162,9 +162,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Proxy_Collection.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Proxy_Collection.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 fbd79d670a7..c8bbea7bd0f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -78,8 +78,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Proxy_List.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Proxy_List.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 089f7caaf71..eb30873d71a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -105,8 +105,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Proxy_RB_Tree.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 0b4607fe62b..e8b583f6c25 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -70,8 +70,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Proxy_RefCount_Guard.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 61873a0de55..8f7e22ac282 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -58,8 +58,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_RefCount_Guard.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_RefCount_Guard.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 efea73b2dcc..a113c649e9a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -42,8 +42,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Shutdown_Proxy.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 fe8b04411b8..fd166be18b0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -57,8 +57,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/ESF/ESF_Worker.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ESF_Worker.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 f60dd53129b..b2a11ab2c6e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -58,9 +58,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Event/EC_Busy_Lock.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Busy_Lock.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 83fd3944ffa..88f7f75e216 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -95,8 +95,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Lifetime_Utils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 f9299545913..57092849dd6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
@@ -64,9 +64,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ConnectionHandler_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
index 1139e6aba01..9c20ae963c1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -48,8 +48,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("FT_ProxyAdmin_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
index 916e7c50820..720d3f21275 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
@@ -39,8 +39,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fault_Detector_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
index d9bda41fe65..fc116884a09 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
@@ -111,9 +111,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTIOP_Acceptor_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 f1fcfa313db..9410ea044a4 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
@@ -105,9 +105,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("HTIOP_Connector_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /*HTIOP_CONNECTOR_IMPL_H*/
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index fc2193ccb7e..5f09a933cd6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -121,9 +121,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Naming/Bindings_Iterator_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Bindings_Iterator_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 8897a02cde2..fe87e1d8f04 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -213,9 +213,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Naming/Naming_Service_Container.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Naming_Service_Container.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 cd231d5ba81..6f4c1312675 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -77,10 +77,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Container_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Container_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_Notify_CONTAINER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
index fbab796366f..1262731d014 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.h
@@ -87,10 +87,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Event_Map_Entry_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Event_Map_Entry_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_Notify_EVENT_MAP_ENTRY_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 29f60d16ce0..31ec6f7dc46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
@@ -109,9 +109,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Event_Map_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Event_Map_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 1c5fd4a61d9..e493ba6b127 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -64,9 +64,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Find_Worker_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Find_Worker_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 9ca4a06f167..e2f1ae4e754 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -67,10 +67,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Method_Request_Updates_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Method_Request_Updates_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_Notify_METHOD_REQUEST_UPDATES_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
index 9bfe7ee793c..c50d78ad921 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.h
@@ -81,11 +81,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "orbsvcs/Notify/MonitorControlExt/MonitorProxySupplier_T.cpp"
-#pragma implementation ("MonitorProxySupplier_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif // TAO_HAS_MONITOR_FRAMEWORK == 1
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 35b02c07772..41934c8eaea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -157,9 +157,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Property_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Property_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 1c8903aeb84..5198ed5b6ce 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -58,9 +58,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/ProxyConsumer_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ProxyConsumer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 a53e6e75705..01fe9251820 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -96,9 +96,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/ProxySupplier_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ProxySupplier_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 e3f254893d5..d2864b0a762 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -107,9 +107,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Proxy_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Proxy_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 a60ab30879e..65a13698d94 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.h
@@ -43,10 +43,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Reconnect_Worker_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconnect_Worker_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* RECONECT_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
index fc1eb795058..b17ab8baa27 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -77,10 +77,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Refcountable_Guard_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Refcountable_Guard_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_Notify_REFCOUNTABLE_GUARD_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
index 241e3df615f..063ceebf6d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h
@@ -54,10 +54,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Save_Persist_Worker_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Save_Persist_Worker_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* SAVE_PERSIST_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 9f2050785ea..9c385e5e283 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -61,9 +61,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Notify/Seq_Worker_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Seq_Worker_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 b25fa1d876d..411c9a18dfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.h
@@ -43,10 +43,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "Validate_Worker_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Validate_Worker_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* NOTIFY_VALIDATE_WORKER_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
index 11ea42ad9f8..d0b0eb3b9de 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -125,10 +125,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-# pragma implementation ("SSLIOP_OpenSSL_st_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_SSLIOP_OPENSSL_ST_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index 915645bdb6b..6ead7c352b7 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -493,9 +493,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconfig_Sched_Utils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 3a8d9fbe6a9..8c3cf498b56 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -601,10 +601,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/Sched/Reconfig_Scheduler_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Reconfig_Scheduler_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_RECONFIG_SCHEDULER_T_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
index 27a7cc1090c..3901ea0491d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
@@ -55,7 +55,7 @@ int
ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
// Detection of closed on read currently not working certain platforms.
-#if defined (sun) || defined (AIX) || defined (__FreeBSD_version)
+#if defined (sun) || defined (__FreeBSD_version)
return 2;
#endif
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/README b/TAO/orbsvcs/tests/Miop/McastLocal/README
index ef226909492..89fb093b9c5 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/README
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/README
@@ -23,7 +23,7 @@ as loopback multicasting seems to have a hardcoded (and unchangeable) SndSock
size of 0. It then throws away all data that is being sent by the client,
therefore the servers will timeout as they won't receive any message.
-Some other systems (AIX and MacOS) also have problems with loopback
+Some other systems (MacOS) also have problems with loopback
multicasting issuing errno such as "Network/address unreachable" for each
send.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index 8d49ec845be..48514f0e473 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -47,9 +47,5 @@ public:
#include "Command_Factory_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Command_Factory_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 e9cedf5d4db..b742f881633 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -78,9 +78,5 @@ protected:
#include "Consumer_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Consumer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 263b2df4803..6b47e00d622 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -107,9 +107,5 @@ protected:
#include "Peer_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Peer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 43d4e6310b2..b8a6f609b85 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -79,9 +79,5 @@ protected:
#include "Supplier_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Supplier_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_Notify_Tests_SUPPLIER_T_H */
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
index be09dae14cd..2a2cf6ce938 100644
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
@@ -54,9 +54,5 @@ class ServantList
#include "ServantList_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ServantList_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* SERVANTLIST_T_H */
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 9c2afdb429c..100120db159 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -77,11 +77,11 @@ Globals::sched_fifo_init ()
{
#if defined (ACE_HAS_THREADS)
// Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-# if defined (_AIX) || defined (__APPLE__) || defined (BSD)
+# if defined (__APPLE__) || defined (BSD)
int scope = ACE_SCOPE_THREAD;
# else
int scope = ACE_SCOPE_PROCESS;
-# endif /* _AIX */
+# endif /* __APPLE__ || BSD */
if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
SCHED_PRIORITY,
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index 00cdf060c87..2645d2e3c2b 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -105,9 +105,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Acceptor_Impl.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Acceptor_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ACCEPTOR_IMPL_H */
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index 43156baa098..d6ce5325f28 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -119,10 +119,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Alias_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Alias_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ALIAS_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index 75d1d23a1c3..2f3046f2b8b 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -71,10 +71,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/AnyTypeCode/Any_Array_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Array_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ANY_ARRAY_IMPL_T_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
index fdd7343bbaf..165be56e4db 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
@@ -68,10 +68,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/AnyTypeCode/Any_Basic_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Basic_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ANY_BASIC_IMPL_T_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
index dd627266355..c0fb14ebb21 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -91,10 +91,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/AnyTypeCode/Any_Dual_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Dual_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ANY_DUAL_IMPL_T_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index 6b36a5289de..d5a000128f7 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -81,10 +81,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/AnyTypeCode/Any_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ANY_IMPL_T_H */
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index c57d09c7a04..330a947fb38 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -73,10 +73,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/AnyTypeCode/Any_Special_Impl_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Special_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ANY_SPECIAL_IMPL_T_H */
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index 66946b70841..d7fd1364a5d 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -120,11 +120,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Enum_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Enum_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_ENUM_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
index f655c3353b5..720f8d42190 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -96,11 +96,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Fixed_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Fixed_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_FIXED_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index 900ba64df0d..1f5f8872c80 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -106,10 +106,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Objref_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Objref_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_OBJREF_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 42eda17ed6a..0a919632c8e 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -174,10 +174,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Recursive_Type_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Recursive_Type_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_RECURSIVE_TYPE_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
index 8f0172be861..80a1fc61cbd 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -109,11 +109,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Sequence_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Sequence_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_SEQUENCE_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h
index 4f7385135da..4a10554b1dd 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -95,10 +95,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/String_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("String_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_STRING_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index a8911809dfc..cd4460d5425 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -137,11 +137,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Struct_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Struct_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
index 3ff1801cffd..f1da3d571f5 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -84,11 +84,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/TypeCode_Base_Attributes.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Base_Attributes.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_TYPECODE_BASE_ATTRIBUTES_H */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index 87de72be46e..40b92e1cf6a 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -180,10 +180,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/TypeCode_Case_Base_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case_Base_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_TYPECODE_CASE_H */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
index d23aaa6b247..4df6147a733 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -98,10 +98,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case_Enum_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_TYPECODE_CASE_T_H */
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
index f859e06ff04..50e6391dcd4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -131,10 +131,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/TypeCode_Case_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_TYPECODE_CASE_T_H */
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 83077b06840..b9c9ae5b45e 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -155,11 +155,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Union_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Union_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_UNION_TYPECODE_H */
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index ebbfa261946..41b7c2b4040 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -155,11 +155,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/AnyTypeCode/Value_TypeCode.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Value_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_VALUE_TYPECODE_H */
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index 78ac9ed7eff..21f362b92a9 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -231,10 +231,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Array_VarOut_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Array_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_ARRAY_VAROUT_T_H */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index ac11e0957b1..071bc111e08 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -195,10 +195,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/BD_String_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BD_String_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_BD_STRING_ARGUMENT_T_H */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 806620dc950..9bda9d331b9 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -172,10 +172,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Basic_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Basic_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_BASIC_ARGUMENT_T_H */
diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h
index 723de777a9e..ca01cefbc6f 100644
--- a/TAO/tao/Buffer_Allocator_T.h
+++ b/TAO/tao/Buffer_Allocator_T.h
@@ -52,9 +52,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Buffer_Allocator_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Buffer_Allocator_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_BUFFER_ALLOCATOR_T_H */
diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h
index ed391738a38..dbd2db4c865 100644
--- a/TAO/tao/Cache_Entries_T.h
+++ b/TAO/tao/Cache_Entries_T.h
@@ -213,10 +213,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Cache_Entries_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("tao/Cache_Entries_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_CACHE_ENTRIES_T_H */
diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
index 6819b1b7027..6a2d04c9c28 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
@@ -74,9 +74,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Codeset/Codeset_Translator_Factory_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Codeset_Translator_Factory_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_Codeset_Translator_Factory_T */
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index f89649345d6..540472dc9b9 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -114,9 +114,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Condition.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Condition.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /*TAO_CONDITION_H*/
diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h
index 42ca96486ec..1a504931fee 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -92,9 +92,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Connector_Impl.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Connector_Impl.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /*TAO_CONNECTOR_IMPL_H*/
diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.h b/TAO/tao/DynamicAny/DynAnyUtils_T.h
index 6d6ba6e033b..56b7e1e05d4 100644
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.h
+++ b/TAO/tao/DynamicAny/DynAnyUtils_T.h
@@ -89,10 +89,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/DynamicAny/DynAnyUtils_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("tao/DynamicAny/DynAnyUtils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_DYNANYUTILS_T_H */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index 83b5f0a45c9..6fedf44fce3 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -183,10 +183,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Fixed_Array_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Array_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_H */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index 6369762f23d..61572709ebb 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -172,10 +172,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Fixed_Size_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Size_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_FIXED_SIZE_ARGUMENT_T_H */
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h
index 69108c9836f..4ad34646475 100644
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h
@@ -64,10 +64,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Intrusive_Ref_Count_Base_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_Ref_Count_Base_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_H */
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
index df2fb310c3c..b9a7b4aed02 100644
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
@@ -148,10 +148,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Intrusive_Ref_Count_Handle_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_Ref_Count_Handle_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H */
diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h
index 1d97550e93e..6a0dbb52b16 100644
--- a/TAO/tao/Intrusive_Ref_Count_Object_T.h
+++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h
@@ -63,10 +63,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Intrusive_Ref_Count_Object_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_Ref_Count_Object_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_INTRUSIVE_REF_COUNT_OBJECT_T_H */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index bfb8af789da..eb436f03a9d 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -194,10 +194,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Object_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Object_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_OBJECT_ARGUMENT_T_H */
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index a2196feb410..58ea3a68455 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -58,10 +58,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Object_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Object_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_CORBA_OBJECT_T_H */
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 6f7595d1f1a..dfba6e88ed6 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -122,10 +122,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Objref_VarOut_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Objref_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_OBJREF_VAROUT_T_H */
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index e8fd6b39c04..506d03483f0 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -92,10 +92,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PI/Interceptor_List_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Interceptor_List_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_INTERCEPTOR_LIST_H */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
index df6ea5d437c..3cf7ed29a6a 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_BD_STRING_SARGUMENT_T_CPP
#define TAO_BD_STRING_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/BD_String_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include "tao/SystemException.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index 1dbd80cbcb7..1d636fd86ef 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -172,10 +172,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/BD_String_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("BD_String_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_BD_STRING_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
index b94ab234a86..69b8bb2525a 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_BASIC_SARGUMENT_T_CPP
#define TAO_BASIC_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Basic_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Basic_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
index 634f04ef1e3..41a0588fee3 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -151,10 +151,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Basic_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Basic_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_BASIC_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 7ffd4bb26f4..307757ab78b 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP
#define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Fixed_Array_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index 45c969025fb..cef4b4befff 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -162,10 +162,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Fixed_Array_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Array_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_FIXED_ARRAY_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index ae9db025549..b5ad7d82dd8 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP
#define TAO_FIXED_SIZE_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Fixed_Size_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index 575c22be156..103861f066a 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -212,10 +212,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Fixed_Size_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Fixed_Size_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_FIXED_SIZE_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
index b3289bcd7e5..fe5f960d60f 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_OBJECT_SARGUMENT_T_CPP
#define TAO_OBJECT_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Object_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Object_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index a11c4181d79..d5233ce3c75 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -175,10 +175,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Object_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Object_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_OBJECT_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 8846e19f05b..768d4696efb 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
#define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Special_Basic_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index d8ea769573f..adf1e2715cf 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -165,10 +165,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Special_Basic_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Special_Basic_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_SPECIAL_BASIC_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
index dc9cd4b4b93..1f3d68a1828 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_UB_STRING_SARGUMENT_T_CPP
#define TAO_UB_STRING_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/UB_String_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/UB_String_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index 89792b2d9e7..bf8fd3fb37b 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -150,10 +150,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/UB_String_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("UB_String_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_UB_STRING_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
index ce95fbe024c..6742fe7f68a 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP
#define TAO_VAR_ARRAY_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Var_Array_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Var_Array_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index 2f501c27f54..76bffae71f7 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -164,10 +164,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Var_Array_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Array_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VAR_ARRAY_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index 285f609dc9d..daa01e75ac8 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP
#define TAO_VAR_SIZE_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Var_Size_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include "tao/SystemException.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index d86ccc57770..e4931099ecf 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -153,10 +153,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Var_Size_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Size_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VAR_SIZE_SARGUMENT_T_H */
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
index b429071c296..a59fc9069c3 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp
@@ -1,10 +1,6 @@
#ifndef TAO_VECTOR_SARGUMENT_T_CPP
#define TAO_VECTOR_SARGUMENT_T_CPP
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#include "tao/PortableServer/Vector_SArgument_T.h"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#if !defined (__ACE_INLINE__)
#include "tao/PortableServer/Vector_SArgument_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h
index caf6aecabe8..418d0c373d4 100644
--- a/TAO/tao/PortableServer/Vector_SArgument_T.h
+++ b/TAO/tao/PortableServer/Vector_SArgument_T.h
@@ -159,10 +159,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/PortableServer/Vector_SArgument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Vector_SArgument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VECTOR_SARGUMENT_T_H */
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 761414716cb..7da78dae803 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -128,10 +128,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Pseudo_VarOut_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Pseudo_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_PSEUDO_VAROUT_T_H */
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
index e677d4e505e..061526c26a2 100644
--- a/TAO/tao/Seq_Out_T.h
+++ b/TAO/tao/Seq_Out_T.h
@@ -63,9 +63,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Seq_Out_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Seq_Out_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_SEQ_OUT_T_H */
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
index 7596db9730a..4126445bfa8 100644
--- a/TAO/tao/Seq_Var_T.h
+++ b/TAO/tao/Seq_Var_T.h
@@ -132,10 +132,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Seq_Var_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Seq_Var_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_SEQ_VAROUT_T_H */
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index 47b72cabd25..a3c247debbd 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -192,10 +192,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Special_Basic_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Special_Basic_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_H */
diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h
index 4a55e38443e..2ee57e09b1b 100644
--- a/TAO/tao/TAO_Singleton.h
+++ b/TAO/tao/TAO_Singleton.h
@@ -119,11 +119,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/TAO_Singleton.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("TAO_Singleton.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* TAO_SINGLETON_H */
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 4e31955cdf2..2299cee62e1 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -46,11 +46,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/TransportCurrent/Current_ORBInitializer.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("tao/TransportCurrent/Current_ORBInitializer.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
#include /**/ "ace/post.h"
#endif /* CURRENT_ORBINITIALIZER_H */
diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h
index 7cc7c188264..fe16173c100 100644
--- a/TAO/tao/Transport_Cache_Manager_T.h
+++ b/TAO/tao/Transport_Cache_Manager_T.h
@@ -273,10 +273,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Transport_Cache_Manager_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("tao/Transport_Cache_Manager_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /*TAO_CONNECTION_CACHE_MANAGER_T_H*/
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 5221d90c31f..22972be4f5b 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -175,10 +175,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/UB_String_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("UB_String_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_UB_STRING_ARGUMENT_T_H */
diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h
index a194bc0354c..f864cc150f8 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -85,10 +85,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
# include "tao/Utils/Server_Main.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-# pragma implementation "Server_Main.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif //TAO_UTILS_SERVANTMAIN_H
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
index a6c3302c4fb..2e334432d98 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -47,9 +47,5 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Valuetype/AbstractBase_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("AbstractBase_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /*TAO_ABSTRACTBASE_T_H*/
diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index b4eba819bb8..35e2978ab09 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -115,10 +115,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Valuetype/Value_VarOut_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Value_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VALUE_VAROUT_T_H */
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
index 857399b3332..386020bc116 100644
--- a/TAO/tao/VarOut_T.h
+++ b/TAO/tao/VarOut_T.h
@@ -161,10 +161,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/VarOut_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VAROUT_T_H */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index f83e7d86abb..a9336cd4eb6 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -184,10 +184,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Var_Array_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Array_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VAR_ARRAY_ARGUMENT_T_H */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index 404a03165a5..479d4a505c9 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -178,10 +178,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Var_Size_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Var_Size_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VAR_SIZE_ARGUMENT_T_H */
diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h
index 4cc8aa62885..46ea90343f0 100644
--- a/TAO/tao/Vector_Argument_T.h
+++ b/TAO/tao/Vector_Argument_T.h
@@ -181,10 +181,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "tao/Vector_Argument_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Vector_Argument_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#include /**/ "ace/post.h"
#endif /* TAO_VECTOR_ARGUMENT_T_H */
diff --git a/TAO/tests/Alt_Mapping/client.h b/TAO/tests/Alt_Mapping/client.h
index 8a4be2d0646..18e366e211c 100644
--- a/TAO/tests/Alt_Mapping/client.h
+++ b/TAO/tests/Alt_Mapping/client.h
@@ -62,8 +62,4 @@ private:
#include "client.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("client.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 244b5b66170..b2bf4023e89 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.h
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.h
@@ -152,8 +152,4 @@ private:
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#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 f8670e65903..4cbf8dd1e2f 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
@@ -53,9 +53,5 @@ private:
#include "ServantList_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ServantList_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* SERVANTLIST_T_H */
diff --git a/TAO/tests/DynAny_Test/test_wrapper.h b/TAO/tests/DynAny_Test/test_wrapper.h
index 11abca739b0..cab1995e79f 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.h
+++ b/TAO/tests/DynAny_Test/test_wrapper.h
@@ -40,8 +40,4 @@ private:
#include "test_wrapper.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("test_wrapper.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* TEST_WRAPPER_H */
diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp
index 827ee12269b..57af23d012d 100644
--- a/TAO/tests/HandleExhaustion/client.cpp
+++ b/TAO/tests/HandleExhaustion/client.cpp
@@ -58,15 +58,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
}
// Try a few times until we run out of "trys" or we no longer get
- // an exception. Some times it takes a little while to begin
- // accepting again on AIX.
+ // an exception.
for(size_t i = 0; i < 10; i++)
try
{
cout << "Client: calling simple, i = " << i << endl;
// This first invocation will actually cause the connection to
// the server. Since the server has run out of file handles,
- // it can not accept the new connection. On AIX, this will
+ // it can not accept the new connection. On some platforms, this will
// receive a CORBA::COMM_FAILURE exception because it doesn't
// complete in a timely manner. It does not mean that the test
// has failed, as long as the server performs the correct
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index e798140edeb..616a7df7559 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -149,8 +149,4 @@ protected:
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Simple_util.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Simple_util.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* TAO_UTIL_H */
diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h
index 1989cac7797..7ed3ce7c1b3 100644
--- a/TAO/tests/Param_Test/client.h
+++ b/TAO/tests/Param_Test/client.h
@@ -65,9 +65,4 @@ private:
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "client.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("client.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
#endif /* CLIENTS_H */
diff --git a/TAO/tests/Time_Policy/main.cpp b/TAO/tests/Time_Policy/main.cpp
index 74d6e0b30e0..cf4a666c134 100644
--- a/TAO/tests/Time_Policy/main.cpp
+++ b/TAO/tests/Time_Policy/main.cpp
@@ -21,7 +21,6 @@
#if (TAO_HAS_TIME_POLICY == 1) && \
(defined (ACE_HAS_HI_RES_TIMER) || \
- defined (ACE_HAS_AIX_HI_RES_TIMER) || \
defined (ACE_WIN32) || \
(defined (ghs) && defined (ACE_HAS_PENTIUM)) || \
((defined (__GNUG__) || defined (__INTEL_COMPILER)) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)) || \
--
cgit v1.2.1