Removed AIX support

34 files changed, 31 insertions, 116 deletions

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 <chris@kohlhoff.com>
  */
diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp
index b0155ef6d2c..25d9e48e46d 100644
--- a/ACE/tests/Bug_3943_Regression_Test.cpp
+++ b/ACE/tests/Bug_3943_Regression_Test.cpp
@@ -199,10 +199,6 @@ namespace {
   /*
    * This class is the product created by both ACE_Connector
    * and ACE_Acceptor objects.
-   *
-   * This class gets its own header file to work around AIX C++
-   * compiler "features" related to template instantiation...  It is
-   * only used by Conn_Test.cpp.
    */
   class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   {
diff --git a/ACE/tests/Cache_Map_Manager_Test.h b/ACE/tests/Cache_Map_Manager_Test.h
index 24cf916479a..31b2569f23e 100644
--- a/ACE/tests/Cache_Map_Manager_Test.h
+++ b/ACE/tests/Cache_Map_Manager_Test.h
@@ -4,8 +4,7 @@
 /**
  *  @file    Cache_Map_Manager_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 Kirthika Parameswaran  <kirthika@cs.wustl.edu>
  */
diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h
index 39d680c87e1..def161547ec 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.h
+++ b/ACE/tests/Cached_Accept_Conn_Test.h
@@ -3,8 +3,7 @@
 /**
  *  @file    Cached_Accept_Conn_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 Kirthika Parameswaran  <kirthika@cs.wustl.edu>
  */
diff --git a/ACE/tests/Cached_Conn_Test.h b/ACE/tests/Cached_Conn_Test.h
index c9e9d6e6fe5..4ca36cd919c 100644
--- a/ACE/tests/Cached_Conn_Test.h
+++ b/ACE/tests/Cached_Conn_Test.h
@@ -3,8 +3,7 @@
 /**
  *  @file    Cached_Conn_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 Kirthika Parameswaran  <kirthika@cs.wustl.edu>
  */
diff --git a/ACE/tests/Collection_Test.h b/ACE/tests/Collection_Test.h
index b8f4c1cd76e..176fa491e51 100644
--- a/ACE/tests/Collection_Test.h
+++ b/ACE/tests/Collection_Test.h
@@ -5,8 +5,7 @@
 /**
  *  @file    Collection_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 Irfan Pyarali <irfan@cs.wustl.edu>
  */
diff --git a/ACE/tests/Conn_Test.h b/ACE/tests/Conn_Test.h
index 637466d19fd..49531fb5603 100644
--- a/ACE/tests/Conn_Test.h
+++ b/ACE/tests/Conn_Test.h
@@ -4,9 +4,6 @@
 /**
  *  @file    Conn_Test.h
  *
- *  Define class needed for generating templates. IBM C++ requires this to
- *  be in its own file for auto template instantiation.
- *
  *  @author Irfan Pyarali  <irfan@cs.wustl.edu>
  */
 //=============================================================================
@@ -27,10 +24,6 @@
  *
  * @brief This class is the product created by both <ACE_Connector>
  * and <ACE_Acceptor> objects.
- *
- * This class gets its own header file to work around AIX C++
- * compiler "features" related to template instantiation...  It is
- * only used by Conn_Test.cpp.
  */
 class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp
index 94dfaa3f2db..7a2648516c6 100644
--- a/ACE/tests/FIFO_Test.cpp
+++ b/ACE/tests/FIFO_Test.cpp
@@ -104,15 +104,8 @@ server (void *arg)
                        ACE_TEXT ("select")),
                       0);
 
-  // On AIX, select() always seems to select a fifo handle as a normal file,
-  // always readable. Just wait a second...
-# if defined (AIX) || defined (__osf__)
-  ACE_OS::sleep (1);
-# endif /* AIX */
-
   // Read the things the client is sending; alphabet, huge overflow, then
   // alphabet.
-
   char buf[BUFSIZ];
   ssize_t recv_count;
   ssize_t expect = static_cast <ssize_t> (ACE_OS::strlen (ACE_ALPHABET));
diff --git a/ACE/tests/Framework_Component_DLL.h b/ACE/tests/Framework_Component_DLL.h
index 91deea999cb..f99bbce4777 100644
--- a/ACE/tests/Framework_Component_DLL.h
+++ b/ACE/tests/Framework_Component_DLL.h
@@ -3,8 +3,7 @@
 /**
  *  @file    Framework_Component_DLL.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 Don Hinton <dhinton@ieee.org>
  */
diff --git a/ACE/tests/Framework_Component_Test.h b/ACE/tests/Framework_Component_Test.h
index 5a77fb7f623..2b8fd75d3e1 100644
--- a/ACE/tests/Framework_Component_Test.h
+++ b/ACE/tests/Framework_Component_Test.h
@@ -3,8 +3,7 @@
 /**
  *  @file    Framework_Component_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 Don Hinton <dhinton@ieee.org>
  */
diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp
index ff1b5f8fe6e..2a7e69a51bf 100644
--- a/ACE/tests/INET_Addr_Test.cpp
+++ b/ACE/tests/INET_Addr_Test.cpp
@@ -248,11 +248,6 @@ int run_main (int, ACE_TCHAR *[])
                     static_cast<const struct sockaddr_in6*> (addr_port.get_addr());
                   const struct sockaddr_in6 *check_in6 =
                     static_cast<const struct sockaddr_in6*> (check.get_addr());
-# if defined(AIX)
-
-                  ACE_ERROR((LM_ERROR, ACE_TEXT ("  addr_port_in6->sin6_len=%d, check_in6->sin6_len=%d\n")
-                    , (int)addr_port_in6->sin6_len, (int)check_in6->sin6_len));
-# endif
 
                   ACE_ERROR((LM_ERROR, ACE_TEXT ("  addr_port_in6->sin6_family=%d, check_in6->sin6_family=%d\n")
                     , (int)addr_port_in6->sin6_family, (int)check_in6->sin6_family));
diff --git a/ACE/tests/MEM_Stream_Test.h b/ACE/tests/MEM_Stream_Test.h
index adc7cdd0dd6..990fdd4645e 100644
--- a/ACE/tests/MEM_Stream_Test.h
+++ b/ACE/tests/MEM_Stream_Test.h
@@ -5,8 +5,7 @@
  *  @file    MEM_Stream_Test.h
  *
  * This file has the class definitions needed for template generation in
- * MEM_Stream_Test.cpp.  They have to be in a separate file so AIX xlC can
- * find them at auto-instantiate time.
+ * MEM_Stream_Test.cpp.
  *
  *  @author Steve Huston <shuston@riverace.com>
  */
diff --git a/ACE/tests/Malloc_Test.h b/ACE/tests/Malloc_Test.h
index c675830581b..6b64e856531 100644
--- a/ACE/tests/Malloc_Test.h
+++ b/ACE/tests/Malloc_Test.h
@@ -2,9 +2,7 @@
 /**
  *  @file    Malloc_Test.h
  *
- *  This class gets its own header file to work around AIX C++
- *  compiler "features" related to template instantiation...  It is
- *  only used by Malloc_Test.cpp.
+ *  It is only used by Malloc_Test.cpp.
  *
  *  @author   Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h
index 0574733260c..5b82ff9b7ef 100644
--- a/ACE/tests/Map_Test.h
+++ b/ACE/tests/Map_Test.h
@@ -5,8 +5,7 @@
  *  @file    Map_Test.h
  *
  * This file has the class definitions needed for template generation in
- * Map_Test.cpp.  They have to be in a separate file so AIX xlC can
- * find them at auto-instantiate time.
+ * Map_Test.cpp.
  *
  *  @author Irfan Pyarali <irfan@cs.wustl.edu>
  */
diff --git a/ACE/tests/Message_Queue_Test_Ex.h b/ACE/tests/Message_Queue_Test_Ex.h
index 8dd9a4a544e..0642fffb96a 100644
--- a/ACE/tests/Message_Queue_Test_Ex.h
+++ b/ACE/tests/Message_Queue_Test_Ex.h
@@ -4,8 +4,7 @@
 /**
  * @file Message_Queue_Test_Ex.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 Michael Vitlo <mvitalo@sprynet.com>
  * @author Irfan Pyarali <irfan@cs.wustl.edu>
diff --git a/ACE/tests/Priority_Reactor_Test.h b/ACE/tests/Priority_Reactor_Test.h
index 7bdc5ff9d1d..44b64f7bbd1 100644
--- a/ACE/tests/Priority_Reactor_Test.h
+++ b/ACE/tests/Priority_Reactor_Test.h
@@ -3,9 +3,7 @@
 /**
  *  @file    Priority_Reactor_Test.h
  *
- *  This class gets its own header file to work around AIX C++
- *  compiler "features" related to template instantiation...  It is
- *  only used by Priority_Reactor_Test.cpp.
+ * It is only used by Priority_Reactor_Test.cpp.
  *
  *  @author Carlos O'Ryan <coryan@cs.wustl.edu>
  */
diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp
index 5d32acc263d..6de098e6430 100644
--- a/ACE/tests/Proactor_UDP_Test.cpp
+++ b/ACE/tests/Proactor_UDP_Test.cpp
@@ -746,10 +746,9 @@ struct Session_Data
 // indicating the addressing info for the client.
 // Master is initialized with a count of the number of expected sessions. After
 // this number are set up, Master will stop listening for session requests.
-// This is a bit fragile but is necessary because on HP-UX, AIX, et al., it
-// is impossible to close/cancel a socket with an outstanding UDP recieve
-// (on AIX the process is so wedged the machine needs to be rebooted to
-// clear it!). So, this bit of messiness is necessary for portability.
+// This is a bit fragile but is necessary because on HP-UX, et al., it
+// is impossible to close/cancel a socket with an outstanding UDP receive
+// So, this bit of messiness is necessary for portability.
 // When the Master is destroyed, it will try to stop establishing sessions
 // but this will only work on Windows.
 class Master : public ACE_Handler
diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp
index 10c2d9187a6..a7a4832f457 100644
--- a/ACE/tests/Process_Manual_Event_Test.cpp
+++ b/ACE/tests/Process_Manual_Event_Test.cpp
@@ -184,20 +184,6 @@ run_main (int argc, ACE_TCHAR *argv[])
 
       // The parent cleans up any remnant of past runs of this test.
       // See Bugzilla #2662 for further info.
-      // On AIX, this is done by removing the shared memory objects before
-      // trying to run.
-#  if defined (AIX)
-      // FUZZ: disable check_for_lack_ACE_OS
-      if (::shm_unlink (event_ping_name) != 0 && errno != ENOENT)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P) event_ping %p\n"),
-                    ACE_TEXT ("shm_unlink")));
-      if (::shm_unlink (event_pong_name) != 0 && errno != ENOENT)
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P) event_pong %p\n"),
-                    ACE_TEXT ("shm_unlink")));
-      // FUZZ: enable check_for_lack_ACE_OS
-#  endif /* AIX */
 
       ACE_TCHAR const * argv_0 = argc > 0 ? argv[0] : ACE_TEXT ("Process_Manual_Event_Test");
 
diff --git a/ACE/tests/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h
index a5a6c731d9d..8075bd35e7c 100644
--- a/ACE/tests/Process_Strategy_Test.h
+++ b/ACE/tests/Process_Strategy_Test.h
@@ -5,8 +5,7 @@
  *  @file    Process_Strategy_Test.h
  *
  *  This file contains the definition of Counting_Service and
- *  Options.  Some compilers need it in a .h file for template
- *  instantiation (such as AIX C Set ++).
+ *  Options.
  *
  *  @author Doug Schmidt <d.schmidt@vanderbilt.edu> and Kevin Boyle <kboyle@sanwafp.com>
  */
diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp
index 3cfc9def393..da2c0f67bb2 100644
--- a/ACE/tests/Process_Test.cpp
+++ b/ACE/tests/Process_Test.cpp
@@ -252,9 +252,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       // Although most systems provide some mechanism to do this, the code
       // in this test uses Linux-specific techniques. Thus, although it
       // is possible to add the code for the checks on, for example,
-      // HP-UX (pstat_getproc, pstat_getpathname) and
-      // AIX (/proc is available, but there's no self and the fds are not links
-      // to the opened file names), the code isn't here at present.
+      // HP-UX (pstat_getproc, pstat_getpathname)
 #if defined (ACE_LACKS_FORK) || defined (ACE_LACKS_READLINK) || !defined(ACE_LINUX)
       ACE_ERROR ((LM_INFO,
                   ACE_TEXT ("The remainder of this test is not supported on this platform\n")));
diff --git a/ACE/tests/Reactor_Fairness_Test.h b/ACE/tests/Reactor_Fairness_Test.h
index 468439c218a..848a817ba92 100644
--- a/ACE/tests/Reactor_Fairness_Test.h
+++ b/ACE/tests/Reactor_Fairness_Test.h
@@ -4,9 +4,7 @@
  *  @file    Reactor_Fairness_Test.h
  *
  *  This file includes template class definitions for the
- *  Reactor_Fairness_Test.cpp program.  This class gets its own
- *  header file to work around AIX C++ compiler "features" related
- *  to template instantiation...
+ *  Reactor_Fairness_Test.cpp program.
  *
  *  @author Steve Huston <shuston@riverace.com>
  */
diff --git a/ACE/tests/Reactor_Performance_Test.h b/ACE/tests/Reactor_Performance_Test.h
index 5fa44547edd..758ac20745f 100644
--- a/ACE/tests/Reactor_Performance_Test.h
+++ b/ACE/tests/Reactor_Performance_Test.h
@@ -4,9 +4,7 @@
  *  @file    Reactor_Performance_Test.h
  *
  *  This file includes template class definitions for the
- *  Reactor_Performance_Test.cpp program.  This class gets its own
- *  header file to work around AIX C++ compiler "features" related
- *  to template instantiation...
+ *  Reactor_Performance_Test.cpp program.
  *
  *  @author Irfan Pyarali <irfan@cs.wustl.edu> and Steve Huston <shuston@riverace.com>
  */
diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp
index 40296f00f84..2db953b4c21 100644
--- a/ACE/tests/SOCK_Connector_Test.cpp
+++ b/ACE/tests/SOCK_Connector_Test.cpp
@@ -103,10 +103,9 @@ find_another_host (ACE_TCHAR other_host[])
       // an infinite loop on Linux --mas 03-08-2001
       while ((h = gethostent ()) != 0)
         {
-          if (ACE_OS::strcmp (h->h_name,
-                              ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0)
+          if (ACE_OS::strcmp (h->h_name, ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0)
             continue;
-          // AIX just _has_ to be different
+
           if (ACE_OS::strcmp (h->h_name, "loopback") == 0)
             continue;
 
diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h
index 6d96043f40f..48775635862 100644
--- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h
+++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.h
@@ -3,9 +3,7 @@
 /**
  *  @file    Thread_Pool_Reactor_SSL_Test.h
  *
- *  This class gets its own header file to work around AIX C++
- *  compiler "features" related to template instantiation...  It is
- *  only used by Thread_Pool_Reactor_Test_SSL.cpp.
+ *  It is only used by Thread_Pool_Reactor_Test_SSL.cpp.
  *
  *  @author   Irfan Pyarali <irfan@cs.wustl.edu>   Nanbor Wang <nanbor@cs.wustl.edu>
  */
diff --git a/ACE/tests/STL_algorithm_Test_T.h b/ACE/tests/STL_algorithm_Test_T.h
index 7aeccccb1ea..68c0113c4b9 100644
--- a/ACE/tests/STL_algorithm_Test_T.h
+++ b/ACE/tests/STL_algorithm_Test_T.h
@@ -20,8 +20,4 @@ int test_STL_algorithm (T & container);
 #include "STL_algorithm_Test_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("STL_algorithm_Test_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
 #endif /* ACE_TESTS_STL_ALGORITHM_TEST_T_H */
diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp
index d43318c96aa..6818f969d34 100644
--- a/ACE/tests/Semaphore_Test.cpp
+++ b/ACE/tests/Semaphore_Test.cpp
@@ -20,7 +20,7 @@
 #include "ace/OS_NS_unistd.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/TP_Reactor_Test.h b/ACE/tests/TP_Reactor_Test.h
index 32c23525273..b5f7e66cd3c 100644
--- a/ACE/tests/TP_Reactor_Test.h
+++ b/ACE/tests/TP_Reactor_Test.h
@@ -3,8 +3,7 @@
 /**
  *  @file    TP_Reactor_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 Alexander Libman <alibman@ihug.com.au>
  *  @author <alexl@rumblgroup.com>
diff --git a/ACE/tests/TSS_Test_Errno.h b/ACE/tests/TSS_Test_Errno.h
index d2c9c8166e4..de556a585fc 100644
--- a/ACE/tests/TSS_Test_Errno.h
+++ b/ACE/tests/TSS_Test_Errno.h
@@ -4,9 +4,7 @@
 /**
  *  @file    TSS_Test_Errno.h
  *
- *  This file contains the definition of Errno.  Some compilers need
- *  it in a .h file for template instantiation (such as AIX C Set
- *  ++).
+ *  This file contains the definition of Errno.
  *
  *  @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu>
  */
@@ -21,9 +19,7 @@
  *
  * @brief Define a simple Errno abstraction
  *
- * This class gets its own header file to work around AIX C++
- * compiler "features" related to template instantiation...  It is
- * only used by TSS_Test.cpp.
+ * It is only used by TSS_Test.cpp.
  */
 class Errno
 {
diff --git a/ACE/tests/Task_Ex_Test.h b/ACE/tests/Task_Ex_Test.h
index 01aa1c1ce08..ccb7c377ed9 100644
--- a/ACE/tests/Task_Ex_Test.h
+++ b/ACE/tests/Task_Ex_Test.h
@@ -4,8 +4,7 @@
 /**
  * @file Task_Ex_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 Kobi Cohen-Arazi <kobi-co@barak-online.net>
  */
diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h
index 67b95e0ccb9..a2fe552260d 100644
--- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h
+++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h
@@ -3,9 +3,7 @@
 /**
  *  @file    Thread_Pool_Reactor_Resume_Test.h
  *
- *  This class gets its own header file to work around AIX C++
- *  compiler "features" related to template instantiation...  It is
- *  only used by Thread_Pool_Reactor_Test.cpp.
+ * It is only used by Thread_Pool_Reactor_Test.cpp.
  *
  *  @author   Irfan Pyarali <irfan@cs.wustl.edu>   Nanbor Wang <nanbor@cs.wustl.edu>
  */
diff --git a/ACE/tests/Thread_Pool_Reactor_Test.h b/ACE/tests/Thread_Pool_Reactor_Test.h
index 78e9dc7b0be..a1abf6852a9 100644
--- a/ACE/tests/Thread_Pool_Reactor_Test.h
+++ b/ACE/tests/Thread_Pool_Reactor_Test.h
@@ -3,9 +3,7 @@
 /**
  *  @file    Thread_Pool_Reactor_Test.h
  *
- *  This class gets its own header file to work around AIX C++
- *  compiler "features" related to template instantiation...  It is
- *  only used by Thread_Pool_Reactor_Test.cpp.
+ *  It is only used by Thread_Pool_Reactor_Test.cpp.
  *
  *  @author   Irfan Pyarali <irfan@cs.wustl.edu>   Nanbor Wang <nanbor@cs.wustl.edu>
  */
diff --git a/ACE/tests/Upgradable_RW_Test.h b/ACE/tests/Upgradable_RW_Test.h
index f27f18995f9..d6de6cbc254 100644
--- a/ACE/tests/Upgradable_RW_Test.h
+++ b/ACE/tests/Upgradable_RW_Test.h
@@ -3,9 +3,7 @@
 /**
  *  @file    Upgradable_RW_Test.h
  *
- *  This class gets its own header file to work around AIX C++
- *  compiler "features" related to template instantiation...  It is
- *  only used by Upgradable_RW_Test.cpp.
+ *  It is only used by Upgradable_RW_Test.cpp.
  *
  *  @author Michael Kircher <mk1@cs.wustl.edu>
  */
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 3bf798d63d3..c98a938e184 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -1169,13 +1169,6 @@ project(Message Queue Test) : acetest {
   Source_Files {
     Message_Queue_Test.cpp
   }
-  verbatim(gnuace,local) {
-    # Needs a larger heap on AIX to avoid overwriting stacks in the counting
-    # part of the test.
-    ifdef AIX_VERS
-      LDFLAGS += -bmaxdata:0x20000000
-    endif
-  }
 }
 
 project(Monotonic_Manual_Event Test) : acetest {