ChangeLogTag: Wed Aug 8 14:06:36 2001 Krishnakumar B <kitty@cs.wustl.edu>

15 files changed, 595 insertions, 428 deletions

diff --git a/ChangeLog b/ChangeLog
index ec503d5597a..c9ae49ee984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,78 +1,122 @@
+Wed Aug  8 14:06:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-tru64.h:
+
+          Define ACE_HAS_NONSTATIC_OBJECT_MANAGER for all DEC Unix 4.x
+          versions.
+
+        * ace/config-cxx-common.h:
+
+          Define ACE_AUTO_PTR_LACKS_RESET if __DECCXX_VER == 60190027.
+          Thanks to Robert Burke <c-robert.burke@wcom.com> for reporting
+          this.
+
+        * include/makeinclude/platform_osf1_3.2.GNU:
+        * include/makeinclude/platform_osf1_4.0.GNU:
+        * include/makeinclude/platform_osf1_4.0_g++.GNU:
+        * include/makeinclude/platform_osf1_4.0_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.0_rcc.GNU:
+
+          Removed the following files.
+
+        * include/makeinclude/platform_osf1_3.2_cxx.GNU:
+        * include/makeinclude/platform_osf1_4.x_cxx.GNU:
+        * include/makeinclude/platform_osf1_4.x_g++.GNU:
+        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.x_rcc.GNU:
+
+          Added new versions of the removed files.
+
+        * include/makeinclude/platform_tru64_pre.GNU:
+        * include/makeinclude/platform_tru64_post.GNU:
+
+          Moved a lot of duplicated code into these new files.
+
+        * include/makeinclude/platform_tru64_cxx.GNU:
+        * include/makeinclude/platform_tru64_g++.GNU:
+        * include/makeinclude/platform_tru64_kcc.GNU:
+
+          Removed a lot of old *cruft* like setting up compilation with
+          cxx when gcc was asked for etc. etc. Somebody went overboard
+          with cut'n paste and copied David's changes blindly. Still not
+          completely satisfied. But it works and is better than before.
+          This also fixes Bug Id 989.
+
 Wed Aug 08 11:30:26 2001  Ossama Othman  <ossama@uci.edu>
 
-	* tests/Service_Config_Test.cpp (run_test):
+        * tests/Service_Config_Test.cpp (run_test):
 
-	  Don't check if "ACE_USES_WCHAR == 1" since some configurations
-	  neglect to set it an integer value.  Instead, just check if it
-	  is defined.
+          Don't check if "ACE_USES_WCHAR == 1" since some configurations
+          neglect to set it an integer value.  Instead, just check if it
+          is defined.
 
 Wed Aug  8 12:31:51 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an
-	  LM_WARNING  to an LM_DEBUG. 
+        * tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an
+          LM_WARNING  to an LM_DEBUG.
 
 Wed Aug 08 11:59:45 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been
-	  defined.
+        * ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been
+          defined.
 
 Wed Aug  8 06:21:24 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* ace/Makefile: Moved Message_Block from STREAMS_FILES to
- 	  UTILS_FILES.
+        * ace/Makefile: Moved Message_Block from STREAMS_FILES to
+          UTILS_FILES.
 
-	* ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to
-	  delete [] d->directory_name_.  Thanks to Olivier Brunet
- 	  <obrunet@groupama-ccama.tm.fr> for reporting this.
+        * ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to
+          delete [] d->directory_name_.  Thanks to Olivier Brunet
+          <obrunet@groupama-ccama.tm.fr> for reporting this.
 
 Tue Aug  7 21:59:42 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* tests/Svc_Handler_Test.cpp: Modified the test to dump the contents
-	  of the temporary file to the log file.
+        * tests/Svc_Handler_Test.cpp: Modified the test to dump the contents
+          of the temporary file to the log file.
 
 Tue Aug  7 19:14:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/CDR_Stream.i:
-	* ace/SOCK_Stream.h: Fixed incorrect comments.
-	  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting
- 	  these.
+        * ace/CDR_Stream.i:
+        * ace/SOCK_Stream.h: Fixed incorrect comments.
+          Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting
+          these.
 
 Tue Aug  7 15:19:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX.
+        * ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX.
 
-	* ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is
-	  an ACE-level #define.  We use this in C++NP v1.
+        * ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is
+          an ACE-level #define.  We use this in C++NP v1.
 
 Tue Aug  7 14:16:57 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/Svc_Handler.cpp: Reimplemented the flush() method to use
-	  the new send_n() method on the various ACE I/O classes.
+        * ace/Svc_Handler.cpp: Reimplemented the flush() method to use
+          the new send_n() method on the various ACE I/O classes.
 
-	* ace/SOCK_Stream.{h,i}:
-  	* ace/FILE_IO.{h,i}: Added a new send_n() method that sends all
-	  the <message_block>s chained through their <next> and <cont>
- 	  pointers using the underlying OS gather-write operation to
- 	  reduce the domain-crossing penalty.
+        * ace/SOCK_Stream.{h,i}:
+        * ace/FILE_IO.{h,i}: Added a new send_n() method that sends all
+          the <message_block>s chained through their <next> and <cont>
+          pointers using the underlying OS gather-write operation to
+          reduce the domain-crossing penalty.
 
 Tue Aug  7 17:27:16 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/Collection_test.cpp: Fixed a compile error with g++. This
-	  is a patch that Johnny Willemsen sent as a part of his last
-	  checkin.
+        * tests/Collection_test.cpp: Fixed a compile error with g++. This
+          is a patch that Johnny Willemsen sent as a part of his last
+          checkin.
 
 Tue Aug 07 11:25:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/config-freebsd-pthread.h: Made the following definition
-	  valid only for pre-4.2-RELEASE.
+        * ace/config-freebsd-pthread.h: Made the following definition
+          valid only for pre-4.2-RELEASE.
 
-	  #define ACE_LACKS_GETPGID
-	  #define ACE_LACKS_SETPGID
-	  #define ACE_LACKS_SETREGID
-	  #define ACE_LACKS_SETREUID
+          #define ACE_LACKS_GETPGID
+          #define ACE_LACKS_SETPGID
+          #define ACE_LACKS_SETREGID
+          #define ACE_LACKS_SETREUID
 
-	  Thanks to Robert Burke <rburke2002@yahoo.com> for reporting
-	  this.
+          Thanks to Robert Burke <rburke2002@yahoo.com> for reporting
+          this.
 
 Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
@@ -85,7 +129,7 @@ Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tests/Hash_Map_Manager_Test.cpp
           Extended this test to test the new const_iterator capabilities
- 	  of the hash map
+          of the hash map
 
         * ace/Unbounded_Set.cpp:
           Implemented missing operator* for the const iterator
@@ -96,74 +140,74 @@ Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
 Mon Aug  6 19:58:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS.
-	  Thanks to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com>
- 	  for reporting this.
+        * ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS.
+          Thanks to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com>
+          for reporting this.
 
-	* ace/OS.h: Added a #include for <sys/modem.h> for HP/UX.  Thanks
-	  to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com> for
- 	  reporting this.
+        * ace/OS.h: Added a #include for <sys/modem.h> for HP/UX.  Thanks
+          to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com> for
+          reporting this.
 
 Mon Aug  6 12:51:35 2001  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-	* ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error
-	  where acquire_write() should be acquire_read().  Thanks to
- 	  Russell Mora <rd.mora@router.econz.co.nz> for fixing this.
+        * ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error
+          where acquire_write() should be acquire_read().  Thanks to
+          Russell Mora <rd.mora@router.econz.co.nz> for fixing this.
 
 Mon Aug 06 17:17:33 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Service_Config.cpp:
+        * ace/Service_Config.cpp:
 
-	  Fixed some debugging messages that were not wrapped within an
-	  ACE_LIB_TEXT macro.
+          Fixed some debugging messages that were not wrapped within an
+          ACE_LIB_TEXT macro.
 
-	* tests/Service_Config_Test.UTF-16.conf:
+        * tests/Service_Config_Test.UTF-16.conf:
 
-	  Interim UTF-16 encoded version of the UTF-8 encoded
-	  Service_Config_Test.conf.  It was generated on a little-endian
-	  host.  Its current purpose is simply to keep our Unicode
-	  regression testing happy until the on-the-fly generation is
-	  implemented.  Once we start generating this file on-the-fly
-	  this file should disappear.
+          Interim UTF-16 encoded version of the UTF-8 encoded
+          Service_Config_Test.conf.  It was generated on a little-endian
+          host.  Its current purpose is simply to keep our Unicode
+          regression testing happy until the on-the-fly generation is
+          implemented.  Once we start generating this file on-the-fly
+          this file should disappear.
 
-	* tests/Service_Config_Test.cpp (run_test):
+        * tests/Service_Config_Test.cpp (run_test):
 
-	  When using full Unicode support, use the version of the Service
-	  Configurator file that is UTF-16 encoded (as described above).
+          When using full Unicode support, use the version of the Service
+          Configurator file that is UTF-16 encoded (as described above).
 
 Mon Aug 06 11:10:24 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Svc_Conf_l.cpp:
+        * ace/Svc_Conf_l.cpp:
 
-	  More Unicode fixes.  Flex's allocation function uses malloc() as
-	  its underlying allocator.  Since it only accepts the size in
-	  bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating
-	  string buffers.  This should clear up some strange looking text
-	  "unknown character" messages emanating from the Service
-	  Configurator's underlying text scanner.
+          More Unicode fixes.  Flex's allocation function uses malloc() as
+          its underlying allocator.  Since it only accepts the size in
+          bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating
+          string buffers.  This should clear up some strange looking text
+          "unknown character" messages emanating from the Service
+          Configurator's underlying text scanner.
 
-	  Note that these changes do not fix the cause of the "unknown
-	  character."  Those fixes should soon follow.
+          Note that these changes do not fix the cause of the "unknown
+          character."  Those fixes should soon follow.
 
 Mon Aug 06 09:04:04 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Svc_Conf.l:
+        * ace/Svc_Conf.l:
 
-	  Unicode updates.  Wrap debugging text within an ACE_LIB_TEXT
-	  macro.
+          Unicode updates.  Wrap debugging text within an ACE_LIB_TEXT
+          macro.
 
 Sun Aug  5 14:31:10 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/run_tests.lst: Ossama suggested that we dont run the
-	  Service_Config_Test in static builds.
+        * tests/run_tests.lst: Ossama suggested that we dont run the
+          Service_Config_Test in static builds.
 
 Fri Aug 04 3:33:31 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* ace/QoS/SOCK_Dgram_Mcast_QoS.h:
-	* ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.h:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
 
-	  Made the open method public so we can open UDP sockets for
-	  non-multicast addresses.
+          Made the open method public so we can open UDP sockets for
+          non-multicast addresses.
 
 Fri Aug 03 22:19:31 2001  Steve Huston  <shuston@riverace.com>
 
@@ -178,40 +222,40 @@ Fri Aug 03 22:15:51 2001  Steve Huston  <shuston@riverace.com>
 
 Fri Aug  3 13:10:59 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER,
-	  ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER):
+        * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER,
+          ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER):
 
-	  Removed unnecessary and some incorrect format specifiers for the
-	  32-bit platform case.  In particular, the format specifier for
-	  an unsigned 64-bit integer was incorrectly set to "%Lu."  "%L"
-	  is the format specifier for a "long double," not a "long long"
-	  integer on 32-bit platforms.  "%llu" is the correct format
-	  specifier which `ace/Basic_Types.h' already defines.
+          Removed unnecessary and some incorrect format specifiers for the
+          32-bit platform case.  In particular, the format specifier for
+          an unsigned 64-bit integer was incorrectly set to "%Lu."  "%L"
+          is the format specifier for a "long double," not a "long long"
+          integer on 32-bit platforms.  "%llu" is the correct format
+          specifier which `ace/Basic_Types.h' already defines.
 
 Fri Aug  3 09:55:38 2001  Ossama Othman  <ossama@uci.edu>
 
-	* bin/auto_run_tests.lst:
+        * bin/auto_run_tests.lst:
 
-	  Added the new TAO "DLL_ORB" test to the list of tests to run.
+          Added the new TAO "DLL_ORB" test to the list of tests to run.
 
 Fri Aug  3 08:26:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* ace/RW_Process_Mutex.cpp: Added a missing comma in the
-	  constructor. This should fix Win32 compile errors.
+        * ace/RW_Process_Mutex.cpp: Added a missing comma in the
+          constructor. This should fix Win32 compile errors.
 
 Fri Aug  3 08:07:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* ace/CDR_Base.cpp: Added a check for a memory allocation failure
-	  in grow (). Thanks to Francis Paul <FranciP@navcanada.ca> for
-	  pointing this out.
+        * ace/CDR_Base.cpp: Added a check for a memory allocation failure
+          in grow (). Thanks to Francis Paul <FranciP@navcanada.ca> for
+          pointing this out.
 
 Thu Aug  2 18:37:23 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS
-	  to the constructor call to ACE_RW_Process_Mutex so that it does
- 	  the right thing on Win32.  Thanks to Wayne Erchak
- 	  <werchak@stentor.com> for reporting this.  This fixes
-	  bugid 996.
+        * ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS
+          to the constructor call to ACE_RW_Process_Mutex so that it does
+          the right thing on Win32.  Thanks to Wayne Erchak
+          <werchak@stentor.com> for reporting this.  This fixes
+          bugid 996.
 
 Thu Aug 02 13:04:19 2001  Steve Huston  <shuston@riverace.com>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ec503d5597a..c9ae49ee984 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,78 +1,122 @@
+Wed Aug  8 14:06:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-tru64.h:
+
+          Define ACE_HAS_NONSTATIC_OBJECT_MANAGER for all DEC Unix 4.x
+          versions.
+
+        * ace/config-cxx-common.h:
+
+          Define ACE_AUTO_PTR_LACKS_RESET if __DECCXX_VER == 60190027.
+          Thanks to Robert Burke <c-robert.burke@wcom.com> for reporting
+          this.
+
+        * include/makeinclude/platform_osf1_3.2.GNU:
+        * include/makeinclude/platform_osf1_4.0.GNU:
+        * include/makeinclude/platform_osf1_4.0_g++.GNU:
+        * include/makeinclude/platform_osf1_4.0_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.0_rcc.GNU:
+
+          Removed the following files.
+
+        * include/makeinclude/platform_osf1_3.2_cxx.GNU:
+        * include/makeinclude/platform_osf1_4.x_cxx.GNU:
+        * include/makeinclude/platform_osf1_4.x_g++.GNU:
+        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.x_rcc.GNU:
+
+          Added new versions of the removed files.
+
+        * include/makeinclude/platform_tru64_pre.GNU:
+        * include/makeinclude/platform_tru64_post.GNU:
+
+          Moved a lot of duplicated code into these new files.
+
+        * include/makeinclude/platform_tru64_cxx.GNU:
+        * include/makeinclude/platform_tru64_g++.GNU:
+        * include/makeinclude/platform_tru64_kcc.GNU:
+
+          Removed a lot of old *cruft* like setting up compilation with
+          cxx when gcc was asked for etc. etc. Somebody went overboard
+          with cut'n paste and copied David's changes blindly. Still not
+          completely satisfied. But it works and is better than before.
+          This also fixes Bug Id 989.
+
 Wed Aug 08 11:30:26 2001  Ossama Othman  <ossama@uci.edu>
 
-	* tests/Service_Config_Test.cpp (run_test):
+        * tests/Service_Config_Test.cpp (run_test):
 
-	  Don't check if "ACE_USES_WCHAR == 1" since some configurations
-	  neglect to set it an integer value.  Instead, just check if it
-	  is defined.
+          Don't check if "ACE_USES_WCHAR == 1" since some configurations
+          neglect to set it an integer value.  Instead, just check if it
+          is defined.
 
 Wed Aug  8 12:31:51 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an
-	  LM_WARNING  to an LM_DEBUG. 
+        * tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an
+          LM_WARNING  to an LM_DEBUG.
 
 Wed Aug 08 11:59:45 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been
-	  defined.
+        * ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been
+          defined.
 
 Wed Aug  8 06:21:24 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* ace/Makefile: Moved Message_Block from STREAMS_FILES to
- 	  UTILS_FILES.
+        * ace/Makefile: Moved Message_Block from STREAMS_FILES to
+          UTILS_FILES.
 
-	* ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to
-	  delete [] d->directory_name_.  Thanks to Olivier Brunet
- 	  <obrunet@groupama-ccama.tm.fr> for reporting this.
+        * ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to
+          delete [] d->directory_name_.  Thanks to Olivier Brunet
+          <obrunet@groupama-ccama.tm.fr> for reporting this.
 
 Tue Aug  7 21:59:42 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* tests/Svc_Handler_Test.cpp: Modified the test to dump the contents
-	  of the temporary file to the log file.
+        * tests/Svc_Handler_Test.cpp: Modified the test to dump the contents
+          of the temporary file to the log file.
 
 Tue Aug  7 19:14:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/CDR_Stream.i:
-	* ace/SOCK_Stream.h: Fixed incorrect comments.
-	  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting
- 	  these.
+        * ace/CDR_Stream.i:
+        * ace/SOCK_Stream.h: Fixed incorrect comments.
+          Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting
+          these.
 
 Tue Aug  7 15:19:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX.
+        * ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX.
 
-	* ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is
-	  an ACE-level #define.  We use this in C++NP v1.
+        * ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is
+          an ACE-level #define.  We use this in C++NP v1.
 
 Tue Aug  7 14:16:57 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/Svc_Handler.cpp: Reimplemented the flush() method to use
-	  the new send_n() method on the various ACE I/O classes.
+        * ace/Svc_Handler.cpp: Reimplemented the flush() method to use
+          the new send_n() method on the various ACE I/O classes.
 
-	* ace/SOCK_Stream.{h,i}:
-  	* ace/FILE_IO.{h,i}: Added a new send_n() method that sends all
-	  the <message_block>s chained through their <next> and <cont>
- 	  pointers using the underlying OS gather-write operation to
- 	  reduce the domain-crossing penalty.
+        * ace/SOCK_Stream.{h,i}:
+        * ace/FILE_IO.{h,i}: Added a new send_n() method that sends all
+          the <message_block>s chained through their <next> and <cont>
+          pointers using the underlying OS gather-write operation to
+          reduce the domain-crossing penalty.
 
 Tue Aug  7 17:27:16 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/Collection_test.cpp: Fixed a compile error with g++. This
-	  is a patch that Johnny Willemsen sent as a part of his last
-	  checkin.
+        * tests/Collection_test.cpp: Fixed a compile error with g++. This
+          is a patch that Johnny Willemsen sent as a part of his last
+          checkin.
 
 Tue Aug 07 11:25:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/config-freebsd-pthread.h: Made the following definition
-	  valid only for pre-4.2-RELEASE.
+        * ace/config-freebsd-pthread.h: Made the following definition
+          valid only for pre-4.2-RELEASE.
 
-	  #define ACE_LACKS_GETPGID
-	  #define ACE_LACKS_SETPGID
-	  #define ACE_LACKS_SETREGID
-	  #define ACE_LACKS_SETREUID
+          #define ACE_LACKS_GETPGID
+          #define ACE_LACKS_SETPGID
+          #define ACE_LACKS_SETREGID
+          #define ACE_LACKS_SETREUID
 
-	  Thanks to Robert Burke <rburke2002@yahoo.com> for reporting
-	  this.
+          Thanks to Robert Burke <rburke2002@yahoo.com> for reporting
+          this.
 
 Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
@@ -85,7 +129,7 @@ Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tests/Hash_Map_Manager_Test.cpp
           Extended this test to test the new const_iterator capabilities
- 	  of the hash map
+          of the hash map
 
         * ace/Unbounded_Set.cpp:
           Implemented missing operator* for the const iterator
@@ -96,74 +140,74 @@ Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
 Mon Aug  6 19:58:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS.
-	  Thanks to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com>
- 	  for reporting this.
+        * ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS.
+          Thanks to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com>
+          for reporting this.
 
-	* ace/OS.h: Added a #include for <sys/modem.h> for HP/UX.  Thanks
-	  to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com> for
- 	  reporting this.
+        * ace/OS.h: Added a #include for <sys/modem.h> for HP/UX.  Thanks
+          to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com> for
+          reporting this.
 
 Mon Aug  6 12:51:35 2001  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-	* ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error
-	  where acquire_write() should be acquire_read().  Thanks to
- 	  Russell Mora <rd.mora@router.econz.co.nz> for fixing this.
+        * ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error
+          where acquire_write() should be acquire_read().  Thanks to
+          Russell Mora <rd.mora@router.econz.co.nz> for fixing this.
 
 Mon Aug 06 17:17:33 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Service_Config.cpp:
+        * ace/Service_Config.cpp:
 
-	  Fixed some debugging messages that were not wrapped within an
-	  ACE_LIB_TEXT macro.
+          Fixed some debugging messages that were not wrapped within an
+          ACE_LIB_TEXT macro.
 
-	* tests/Service_Config_Test.UTF-16.conf:
+        * tests/Service_Config_Test.UTF-16.conf:
 
-	  Interim UTF-16 encoded version of the UTF-8 encoded
-	  Service_Config_Test.conf.  It was generated on a little-endian
-	  host.  Its current purpose is simply to keep our Unicode
-	  regression testing happy until the on-the-fly generation is
-	  implemented.  Once we start generating this file on-the-fly
-	  this file should disappear.
+          Interim UTF-16 encoded version of the UTF-8 encoded
+          Service_Config_Test.conf.  It was generated on a little-endian
+          host.  Its current purpose is simply to keep our Unicode
+          regression testing happy until the on-the-fly generation is
+          implemented.  Once we start generating this file on-the-fly
+          this file should disappear.
 
-	* tests/Service_Config_Test.cpp (run_test):
+        * tests/Service_Config_Test.cpp (run_test):
 
-	  When using full Unicode support, use the version of the Service
-	  Configurator file that is UTF-16 encoded (as described above).
+          When using full Unicode support, use the version of the Service
+          Configurator file that is UTF-16 encoded (as described above).
 
 Mon Aug 06 11:10:24 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Svc_Conf_l.cpp:
+        * ace/Svc_Conf_l.cpp:
 
-	  More Unicode fixes.  Flex's allocation function uses malloc() as
-	  its underlying allocator.  Since it only accepts the size in
-	  bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating
-	  string buffers.  This should clear up some strange looking text
-	  "unknown character" messages emanating from the Service
-	  Configurator's underlying text scanner.
+          More Unicode fixes.  Flex's allocation function uses malloc() as
+          its underlying allocator.  Since it only accepts the size in
+          bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating
+          string buffers.  This should clear up some strange looking text
+          "unknown character" messages emanating from the Service
+          Configurator's underlying text scanner.
 
-	  Note that these changes do not fix the cause of the "unknown
-	  character."  Those fixes should soon follow.
+          Note that these changes do not fix the cause of the "unknown
+          character."  Those fixes should soon follow.
 
 Mon Aug 06 09:04:04 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Svc_Conf.l:
+        * ace/Svc_Conf.l:
 
-	  Unicode updates.  Wrap debugging text within an ACE_LIB_TEXT
-	  macro.
+          Unicode updates.  Wrap debugging text within an ACE_LIB_TEXT
+          macro.
 
 Sun Aug  5 14:31:10 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/run_tests.lst: Ossama suggested that we dont run the
-	  Service_Config_Test in static builds.
+        * tests/run_tests.lst: Ossama suggested that we dont run the
+          Service_Config_Test in static builds.
 
 Fri Aug 04 3:33:31 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* ace/QoS/SOCK_Dgram_Mcast_QoS.h:
-	* ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.h:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
 
-	  Made the open method public so we can open UDP sockets for
-	  non-multicast addresses.
+          Made the open method public so we can open UDP sockets for
+          non-multicast addresses.
 
 Fri Aug 03 22:19:31 2001  Steve Huston  <shuston@riverace.com>
 
@@ -178,40 +222,40 @@ Fri Aug 03 22:15:51 2001  Steve Huston  <shuston@riverace.com>
 
 Fri Aug  3 13:10:59 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER,
-	  ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER):
+        * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER,
+          ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER):
 
-	  Removed unnecessary and some incorrect format specifiers for the
-	  32-bit platform case.  In particular, the format specifier for
-	  an unsigned 64-bit integer was incorrectly set to "%Lu."  "%L"
-	  is the format specifier for a "long double," not a "long long"
-	  integer on 32-bit platforms.  "%llu" is the correct format
-	  specifier which `ace/Basic_Types.h' already defines.
+          Removed unnecessary and some incorrect format specifiers for the
+          32-bit platform case.  In particular, the format specifier for
+          an unsigned 64-bit integer was incorrectly set to "%Lu."  "%L"
+          is the format specifier for a "long double," not a "long long"
+          integer on 32-bit platforms.  "%llu" is the correct format
+          specifier which `ace/Basic_Types.h' already defines.
 
 Fri Aug  3 09:55:38 2001  Ossama Othman  <ossama@uci.edu>
 
-	* bin/auto_run_tests.lst:
+        * bin/auto_run_tests.lst:
 
-	  Added the new TAO "DLL_ORB" test to the list of tests to run.
+          Added the new TAO "DLL_ORB" test to the list of tests to run.
 
 Fri Aug  3 08:26:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* ace/RW_Process_Mutex.cpp: Added a missing comma in the
-	  constructor. This should fix Win32 compile errors.
+        * ace/RW_Process_Mutex.cpp: Added a missing comma in the
+          constructor. This should fix Win32 compile errors.
 
 Fri Aug  3 08:07:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* ace/CDR_Base.cpp: Added a check for a memory allocation failure
-	  in grow (). Thanks to Francis Paul <FranciP@navcanada.ca> for
-	  pointing this out.
+        * ace/CDR_Base.cpp: Added a check for a memory allocation failure
+          in grow (). Thanks to Francis Paul <FranciP@navcanada.ca> for
+          pointing this out.
 
 Thu Aug  2 18:37:23 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS
-	  to the constructor call to ACE_RW_Process_Mutex so that it does
- 	  the right thing on Win32.  Thanks to Wayne Erchak
- 	  <werchak@stentor.com> for reporting this.  This fixes
-	  bugid 996.
+        * ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS
+          to the constructor call to ACE_RW_Process_Mutex so that it does
+          the right thing on Win32.  Thanks to Wayne Erchak
+          <werchak@stentor.com> for reporting this.  This fixes
+          bugid 996.
 
 Thu Aug 02 13:04:19 2001  Steve Huston  <shuston@riverace.com>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ec503d5597a..c9ae49ee984 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,78 +1,122 @@
+Wed Aug  8 14:06:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+        * ace/config-tru64.h:
+
+          Define ACE_HAS_NONSTATIC_OBJECT_MANAGER for all DEC Unix 4.x
+          versions.
+
+        * ace/config-cxx-common.h:
+
+          Define ACE_AUTO_PTR_LACKS_RESET if __DECCXX_VER == 60190027.
+          Thanks to Robert Burke <c-robert.burke@wcom.com> for reporting
+          this.
+
+        * include/makeinclude/platform_osf1_3.2.GNU:
+        * include/makeinclude/platform_osf1_4.0.GNU:
+        * include/makeinclude/platform_osf1_4.0_g++.GNU:
+        * include/makeinclude/platform_osf1_4.0_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.0_rcc.GNU:
+
+          Removed the following files.
+
+        * include/makeinclude/platform_osf1_3.2_cxx.GNU:
+        * include/makeinclude/platform_osf1_4.x_cxx.GNU:
+        * include/makeinclude/platform_osf1_4.x_g++.GNU:
+        * include/makeinclude/platform_osf1_4.x_kcc.GNU:
+        * include/makeinclude/platform_osf1_4.x_rcc.GNU:
+
+          Added new versions of the removed files.
+
+        * include/makeinclude/platform_tru64_pre.GNU:
+        * include/makeinclude/platform_tru64_post.GNU:
+
+          Moved a lot of duplicated code into these new files.
+
+        * include/makeinclude/platform_tru64_cxx.GNU:
+        * include/makeinclude/platform_tru64_g++.GNU:
+        * include/makeinclude/platform_tru64_kcc.GNU:
+
+          Removed a lot of old *cruft* like setting up compilation with
+          cxx when gcc was asked for etc. etc. Somebody went overboard
+          with cut'n paste and copied David's changes blindly. Still not
+          completely satisfied. But it works and is better than before.
+          This also fixes Bug Id 989.
+
 Wed Aug 08 11:30:26 2001  Ossama Othman  <ossama@uci.edu>
 
-	* tests/Service_Config_Test.cpp (run_test):
+        * tests/Service_Config_Test.cpp (run_test):
 
-	  Don't check if "ACE_USES_WCHAR == 1" since some configurations
-	  neglect to set it an integer value.  Instead, just check if it
-	  is defined.
+          Don't check if "ACE_USES_WCHAR == 1" since some configurations
+          neglect to set it an integer value.  Instead, just check if it
+          is defined.
 
 Wed Aug  8 12:31:51 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an
-	  LM_WARNING  to an LM_DEBUG. 
+        * tests/MEM_Stream_Test.cpp: Changed a ACE_DEBUG statment with an
+          LM_WARNING  to an LM_DEBUG.
 
 Wed Aug 08 11:59:45 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been
-	  defined.
+        * ace/OS.h: Do not redefine ACE_IOV_MAX if it has already been
+          defined.
 
 Wed Aug  8 06:21:24 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* ace/Makefile: Moved Message_Block from STREAMS_FILES to
- 	  UTILS_FILES.
+        * ace/Makefile: Moved Message_Block from STREAMS_FILES to
+          UTILS_FILES.
 
-	* ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to
-	  delete [] d->directory_name_.  Thanks to Olivier Brunet
- 	  <obrunet@groupama-ccama.tm.fr> for reporting this.
+        * ace/OS_Dirent.inl (closedir): Changed delete d->directory_name_ to
+          delete [] d->directory_name_.  Thanks to Olivier Brunet
+          <obrunet@groupama-ccama.tm.fr> for reporting this.
 
 Tue Aug  7 21:59:42 2001  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
-	* tests/Svc_Handler_Test.cpp: Modified the test to dump the contents
-	  of the temporary file to the log file.
+        * tests/Svc_Handler_Test.cpp: Modified the test to dump the contents
+          of the temporary file to the log file.
 
 Tue Aug  7 19:14:24 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/CDR_Stream.i:
-	* ace/SOCK_Stream.h: Fixed incorrect comments.
-	  Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting
- 	  these.
+        * ace/CDR_Stream.i:
+        * ace/SOCK_Stream.h: Fixed incorrect comments.
+          Thanks to Alain Decamps <Alain.Decamps@PIDPA.be> for reporting
+          these.
 
 Tue Aug  7 15:19:38 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX.
+        * ace: Changed all uses of IOV_MAX to use the new ACE_IOV_MAX.
 
-	* ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is
-	  an ACE-level #define.  We use this in C++NP v1.
+        * ace/OS.h: Added a new ACE_IOV_MAX that makes it clear this is
+          an ACE-level #define.  We use this in C++NP v1.
 
 Tue Aug  7 14:16:57 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/Svc_Handler.cpp: Reimplemented the flush() method to use
-	  the new send_n() method on the various ACE I/O classes.
+        * ace/Svc_Handler.cpp: Reimplemented the flush() method to use
+          the new send_n() method on the various ACE I/O classes.
 
-	* ace/SOCK_Stream.{h,i}:
-  	* ace/FILE_IO.{h,i}: Added a new send_n() method that sends all
-	  the <message_block>s chained through their <next> and <cont>
- 	  pointers using the underlying OS gather-write operation to
- 	  reduce the domain-crossing penalty.
+        * ace/SOCK_Stream.{h,i}:
+        * ace/FILE_IO.{h,i}: Added a new send_n() method that sends all
+          the <message_block>s chained through their <next> and <cont>
+          pointers using the underlying OS gather-write operation to
+          reduce the domain-crossing penalty.
 
 Tue Aug  7 17:27:16 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/Collection_test.cpp: Fixed a compile error with g++. This
-	  is a patch that Johnny Willemsen sent as a part of his last
-	  checkin.
+        * tests/Collection_test.cpp: Fixed a compile error with g++. This
+          is a patch that Johnny Willemsen sent as a part of his last
+          checkin.
 
 Tue Aug 07 11:25:36 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/config-freebsd-pthread.h: Made the following definition
-	  valid only for pre-4.2-RELEASE.
+        * ace/config-freebsd-pthread.h: Made the following definition
+          valid only for pre-4.2-RELEASE.
 
-	  #define ACE_LACKS_GETPGID
-	  #define ACE_LACKS_SETPGID
-	  #define ACE_LACKS_SETREGID
-	  #define ACE_LACKS_SETREUID
+          #define ACE_LACKS_GETPGID
+          #define ACE_LACKS_SETPGID
+          #define ACE_LACKS_SETREGID
+          #define ACE_LACKS_SETREUID
 
-	  Thanks to Robert Burke <rburke2002@yahoo.com> for reporting
-	  this.
+          Thanks to Robert Burke <rburke2002@yahoo.com> for reporting
+          this.
 
 Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
@@ -85,7 +129,7 @@ Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tests/Hash_Map_Manager_Test.cpp
           Extended this test to test the new const_iterator capabilities
- 	  of the hash map
+          of the hash map
 
         * ace/Unbounded_Set.cpp:
           Implemented missing operator* for the const iterator
@@ -96,74 +140,74 @@ Tue Aug 07 16:40:12 2001  Johnny Willemsen <jwillemsen@remedy.nl>
 
 Mon Aug  6 19:58:48 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS.
-	  Thanks to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com>
- 	  for reporting this.
+        * ace/config-hpux-11.00.h: Added #define for ACE_HAS_TERM_IOCTLS.
+          Thanks to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com>
+          for reporting this.
 
-	* ace/OS.h: Added a #include for <sys/modem.h> for HP/UX.  Thanks
-	  to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com> for
- 	  reporting this.
+        * ace/OS.h: Added a #include for <sys/modem.h> for HP/UX.  Thanks
+          to Torbjorn Backstrom <torbjorn.k.backstrom@volvo.com> for
+          reporting this.
 
 Mon Aug  6 12:51:35 2001  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
-	* ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error
-	  where acquire_write() should be acquire_read().  Thanks to
- 	  Russell Mora <rd.mora@router.econz.co.nz> for fixing this.
+        * ace/Synch.h (ACE_Null_Mutex>): Fixed a cut&paste error
+          where acquire_write() should be acquire_read().  Thanks to
+          Russell Mora <rd.mora@router.econz.co.nz> for fixing this.
 
 Mon Aug 06 17:17:33 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Service_Config.cpp:
+        * ace/Service_Config.cpp:
 
-	  Fixed some debugging messages that were not wrapped within an
-	  ACE_LIB_TEXT macro.
+          Fixed some debugging messages that were not wrapped within an
+          ACE_LIB_TEXT macro.
 
-	* tests/Service_Config_Test.UTF-16.conf:
+        * tests/Service_Config_Test.UTF-16.conf:
 
-	  Interim UTF-16 encoded version of the UTF-8 encoded
-	  Service_Config_Test.conf.  It was generated on a little-endian
-	  host.  Its current purpose is simply to keep our Unicode
-	  regression testing happy until the on-the-fly generation is
-	  implemented.  Once we start generating this file on-the-fly
-	  this file should disappear.
+          Interim UTF-16 encoded version of the UTF-8 encoded
+          Service_Config_Test.conf.  It was generated on a little-endian
+          host.  Its current purpose is simply to keep our Unicode
+          regression testing happy until the on-the-fly generation is
+          implemented.  Once we start generating this file on-the-fly
+          this file should disappear.
 
-	* tests/Service_Config_Test.cpp (run_test):
+        * tests/Service_Config_Test.cpp (run_test):
 
-	  When using full Unicode support, use the version of the Service
-	  Configurator file that is UTF-16 encoded (as described above).
+          When using full Unicode support, use the version of the Service
+          Configurator file that is UTF-16 encoded (as described above).
 
 Mon Aug 06 11:10:24 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Svc_Conf_l.cpp:
+        * ace/Svc_Conf_l.cpp:
 
-	  More Unicode fixes.  Flex's allocation function uses malloc() as
-	  its underlying allocator.  Since it only accepts the size in
-	  bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating
-	  string buffers.  This should clear up some strange looking text
-	  "unknown character" messages emanating from the Service
-	  Configurator's underlying text scanner.
+          More Unicode fixes.  Flex's allocation function uses malloc() as
+          its underlying allocator.  Since it only accepts the size in
+          bytes, allocate "size * sizeof (ACE_TCHAR)" when allocating
+          string buffers.  This should clear up some strange looking text
+          "unknown character" messages emanating from the Service
+          Configurator's underlying text scanner.
 
-	  Note that these changes do not fix the cause of the "unknown
-	  character."  Those fixes should soon follow.
+          Note that these changes do not fix the cause of the "unknown
+          character."  Those fixes should soon follow.
 
 Mon Aug 06 09:04:04 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/Svc_Conf.l:
+        * ace/Svc_Conf.l:
 
-	  Unicode updates.  Wrap debugging text within an ACE_LIB_TEXT
-	  macro.
+          Unicode updates.  Wrap debugging text within an ACE_LIB_TEXT
+          macro.
 
 Sun Aug  5 14:31:10 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/run_tests.lst: Ossama suggested that we dont run the
-	  Service_Config_Test in static builds.
+        * tests/run_tests.lst: Ossama suggested that we dont run the
+          Service_Config_Test in static builds.
 
 Fri Aug 04 3:33:31 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* ace/QoS/SOCK_Dgram_Mcast_QoS.h:
-	* ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.h:
+        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
 
-	  Made the open method public so we can open UDP sockets for
-	  non-multicast addresses.
+          Made the open method public so we can open UDP sockets for
+          non-multicast addresses.
 
 Fri Aug 03 22:19:31 2001  Steve Huston  <shuston@riverace.com>
 
@@ -178,40 +222,40 @@ Fri Aug 03 22:15:51 2001  Steve Huston  <shuston@riverace.com>
 
 Fri Aug  3 13:10:59 2001  Ossama Othman  <ossama@uci.edu>
 
-	* ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER,
-	  ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER):
+        * ace/config-linux-common.h (ACE_UINT64_FORMAT_SPECIFIER,
+          ACE_SSIZE_T_FORMAT_SPECIFIER, ACE_SIZE_T_FORMAT_SPECIFIER):
 
-	  Removed unnecessary and some incorrect format specifiers for the
-	  32-bit platform case.  In particular, the format specifier for
-	  an unsigned 64-bit integer was incorrectly set to "%Lu."  "%L"
-	  is the format specifier for a "long double," not a "long long"
-	  integer on 32-bit platforms.  "%llu" is the correct format
-	  specifier which `ace/Basic_Types.h' already defines.
+          Removed unnecessary and some incorrect format specifiers for the
+          32-bit platform case.  In particular, the format specifier for
+          an unsigned 64-bit integer was incorrectly set to "%Lu."  "%L"
+          is the format specifier for a "long double," not a "long long"
+          integer on 32-bit platforms.  "%llu" is the correct format
+          specifier which `ace/Basic_Types.h' already defines.
 
 Fri Aug  3 09:55:38 2001  Ossama Othman  <ossama@uci.edu>
 
-	* bin/auto_run_tests.lst:
+        * bin/auto_run_tests.lst:
 
-	  Added the new TAO "DLL_ORB" test to the list of tests to run.
+          Added the new TAO "DLL_ORB" test to the list of tests to run.
 
 Fri Aug  3 08:26:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* ace/RW_Process_Mutex.cpp: Added a missing comma in the
-	  constructor. This should fix Win32 compile errors.
+        * ace/RW_Process_Mutex.cpp: Added a missing comma in the
+          constructor. This should fix Win32 compile errors.
 
 Fri Aug  3 08:07:45 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* ace/CDR_Base.cpp: Added a check for a memory allocation failure
-	  in grow (). Thanks to Francis Paul <FranciP@navcanada.ca> for
-	  pointing this out.
+        * ace/CDR_Base.cpp: Added a check for a memory allocation failure
+          in grow (). Thanks to Francis Paul <FranciP@navcanada.ca> for
+          pointing this out.
 
 Thu Aug  2 18:37:23 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS
-	  to the constructor call to ACE_RW_Process_Mutex so that it does
- 	  the right thing on Win32.  Thanks to Wayne Erchak
- 	  <werchak@stentor.com> for reporting this.  This fixes
-	  bugid 996.
+        * ace/RW_Process_Mutex.cpp: Added ACE_DEFAULT_OPEN_PERMS
+          to the constructor call to ACE_RW_Process_Mutex so that it does
+          the right thing on Win32.  Thanks to Wayne Erchak
+          <werchak@stentor.com> for reporting this.  This fixes
+          bugid 996.
 
 Thu Aug 02 13:04:19 2001  Steve Huston  <shuston@riverace.com>
 
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
index 25d57b3a9e2..88aa69a3f15 100644
--- a/ace/config-cxx-common.h
+++ b/ace/config-cxx-common.h
@@ -23,7 +23,7 @@
 # define ACE_HAS_CPLUSPLUS_HEADERS
 # if (__DECCXX_VER >= 60090010)
     // DEC CXX 6.0 supports exceptions, etc., by default.  Exceptions
-    // are enabled by platform_osf1_4.0.GNU/wrapper_macros.GNU.
+    // are enabled by platform_osf1_4.x.GNU/wrapper_macros.GNU.
 #   if defined (ACE_HAS_EXCEPTIONS)
 #     define ACE_NEW_THROWS_EXCEPTIONS
 #   endif /* ACE_HAS_EXCEPTIONS */
@@ -67,6 +67,11 @@
 #     pragma message disable intconlosbit
 #   endif /* __DECCXX_VER >= 60190029 */
 
+# if (__DECCXX_VER == 60190027)
+      // Seems that this version of cxx doesn't have reset
+#     define ACE_AUTO_PTR_LACKS_RESET
+#   endif /* __DECCXX_VER == 60190027 */
+
 #   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX >= 0x40D
       // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
 #     pragma message disable declbutnotref
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 40a10fb315f..313d93d9fb0 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -11,9 +11,9 @@
 
 #if defined (DIGITAL_UNIX)
 # include "ace/config-osf1-4.0.h"
+# define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 # if DIGITAL_UNIX >= 0x40D
 #   define ACE_LACKS_SYSTIME_H
-#   define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 # endif /* DIGITAL_UNIX >= 0x40D */
 #else  /* ! DIGITAL_UNIX */
 # include "ace/config-osf1-3.2.h"
diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2_cxx.GNU
index d2da4954e75..ef52f05bf58 100644
--- a/include/makeinclude/platform_osf1_3.2.GNU
+++ b/include/makeinclude/platform_osf1_3.2_cxx.GNU
@@ -3,7 +3,27 @@
 # This platform macros file is intended to work with Digital UNIX 3.2
 # (OSF/1 3.2g) with CXX 5.7 or later.
 
-debug = 1
+ifeq (,$(debug))
+  debug = 1
+endif
+
+# exceptions=1 is the default on this platform. exceptions=0 has not
+# been tested. See the bottom of this file for more. Turning off exceptions
+# on this platform can cause bad things to happen.
+
+ifeq (,$(exceptions))
+  exceptions = 1
+endif
+
+# We want to test with rtti=1
+
+ifeq (,$(rtti))
+   rtti = 1
+endif
+
+ifeq (,$(threads))
+  threads = 1
+endif
 
 CC              = cxx
 CXX             = $(CC)
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.x_cxx.GNU
index a54c87da97a..97d1a2a1d4f 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.x_cxx.GNU
@@ -1,7 +1,7 @@
 # $Id$
 
 # This platform macros file is intended to work with
-# Digital UNIX 4.0 (OSF/1 4.0), using the cxx compiler..
+# Digital UNIX 4.x (OSF/1 4.x), using the cxx compiler..
 
 # Note that TAO has not been tested with debug=0 on this platform. So
 # you should be careful when turning off debug.
@@ -53,12 +53,10 @@ ifneq ($(CXX_VER),CXX_5)
     #### It's not necessary on DU 5.0.
     WARNING_FLAGS += -msg_disable 1016
   endif # optimize
-
-  ifndef ACE_DU_VERSION
-    # In case this file wasn't included by platform_osf1_cxx.GNU:
+  ifeq (4.,$(findstring 4.,$(shell uname -r)))
     # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
     WARNING_FLAGS += -msg_disable 9
-  endif # ACE_DU_VERSION
+  endif
 endif # 6.0 or later
 
 CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS)
diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.x_g++.GNU
index 44cb2c39ac2..0f3f03b02ae 100644
--- a/include/makeinclude/platform_osf1_4.0_g++.GNU
+++ b/include/makeinclude/platform_osf1_4.x_g++.GNU
@@ -1,14 +1,23 @@
 # $Id$
 
-# This platform macros file is intended to work with Digital UNIX 4.0
-# (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer).
+# This platform macros file is intended to work with Digital UNIX 4.x
+# (OSF/1 4.x) and GCC in version 2.7.2.1 (or newer).
 
 ifeq (,$(debug))
   debug = 1
 endif
+
 ifeq (,$(exceptions))
   exceptions = 1
 endif
+ifeq (,$(rtti))
+   rtti = 1
+endif
+
+ifeq (,$(threads))
+  threads = 1
+endif
+
 ifeq (,$(optimize))
   optimize = 1
 endif
diff --git a/include/makeinclude/platform_osf1_4.0_kcc.GNU b/include/makeinclude/platform_osf1_4.x_kcc.GNU
index ec46c27bd73..474ac00e134 100644
--- a/include/makeinclude/platform_osf1_4.0_kcc.GNU
+++ b/include/makeinclude/platform_osf1_4.x_kcc.GNU
@@ -1,10 +1,27 @@
 # $Id$
 
-# This platform macros file is intended to work with Digital UNIX 4.0
-# (OSF/1 4.0) and KAI C++ 3.3f.
+# This platform macros file is intended to work with Digital UNIX 4.x
+# (OSF/1 4.x) and KAI C++ 3.3f.
 
-debug = 1
-optimize = 1
+ifeq (,$(debug))
+  debug = 1
+endif
+
+ifeq (,$(exceptions))
+  exceptions = 1
+endif
+
+ifeq (,$(rtti))
+   rtti = 1
+endif
+
+ifeq (,$(threads))
+  threads = 1
+endif
+
+ifeq (,$(optimize))
+  optimize = 1
+endif
 
 # WARNING_FLAGS +=
 #   9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
diff --git a/include/makeinclude/platform_osf1_4.0_rcc.GNU b/include/makeinclude/platform_osf1_4.x_rcc.GNU
index f188fe2d682..4e54558e56f 100644
--- a/include/makeinclude/platform_osf1_4.0_rcc.GNU
+++ b/include/makeinclude/platform_osf1_4.x_rcc.GNU
@@ -3,8 +3,24 @@
 # This platform macros file is intended to work with Rational C++ (2.4.1) on
 # Digital UNIX 4.0 (OSF/1 4.0).
 
-debug = 1
-exceptions = 1
+ifeq (,$(debug))
+  debug = 1
+endif
+
+ifeq (,$(exceptions))
+  exceptions = 1
+endif
+ifeq (,$(rtti))
+   rtti = 1
+endif
+
+ifeq (,$(threads))
+  threads = 1
+endif
+
+ifeq (,$(optimize))
+  optimize = 1
+endif
 
 CC              = rcc
 CXX             = RCC
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
index 139102689cc..a8f08d5a155 100644
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ b/include/makeinclude/platform_tru64_cxx.GNU
@@ -3,56 +3,23 @@
 # This platform macros file is intended to work with
 # Digital UNIX using the cxx compiler.
 
-ifndef ACE_DU_VERSION
-  ACE_DU_VERSION := $(shell uname -r)
-endif # ! ACE_DU_VERSION
-
-ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
-
-else # ! 3.x
-ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
-
-  ifndef ACE_DU_SUBVERSION
-    ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v)
-  endif # ! ACE_DU_SUBVERSION
-
-  ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40F
-  else
-  ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40E
-  else
-  ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40D
-  else
-    CFLAGS += -DDIGITAL_UNIX=0x400
-  endif
-  endif
-  endif
-
-  ifneq ($(CXX_VER),CXX_5)
-    # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
-    WARNING_FLAGS += -msg_disable 9
-  endif # 6.0 or later
-
-else # ! 4.x
-ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU
+
 
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
+# Include the macro file for osf1_4.x
+#
+include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_cxx.GNU
 
-  ifndef ACE_DU_SUBVERSION
-    ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v)
-  endif # ! ACE_DU_SUBVERSION
 
-  ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x510
-  else
-    CFLAGS += -DDIGITAL_UNIX=0x500
-  endif
+# Flags specific to 5.x
+#
+ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
+    SOFLAGS = -shared -use_ld_input $(ACELIB)
+endif # ! 5.x
+
 
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU
diff --git a/include/makeinclude/platform_tru64_g++.GNU b/include/makeinclude/platform_tru64_g++.GNU
index 939f4063470..155d71109f8 100644
--- a/include/makeinclude/platform_tru64_g++.GNU
+++ b/include/makeinclude/platform_tru64_g++.GNU
@@ -7,40 +7,14 @@
 # fact neither compilation nor testing has been done for almost a year.
 # So it's better to avoid this combination, if possible.
 
-ifndef ACE_DU_VERSION
-  ACE_DU_VERSION := $(shell uname -r)
-endif # ACE_DU_VERSION
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU
 
-ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
+# Include the macro file for osf1_4.x
+#
+include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_g++.GNU
 
-else # ! 3.x
-ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
-
-  ifndef ACE_DU_SUBVERSION
-    ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v)
-  endif # ! ACE_DU_SUBVERSION
-
-  ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40F
-  else
-  ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40E
-  else
-  ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x40D
-  else
-    CFLAGS += -DDIGITAL_UNIX=0x400
-  endif
-  endif
-  endif
-
-else # ! 4.x
-ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_g++.GNU
-  CFLAGS += -DDIGITAL_UNIX=0x500
-endif # 5.x
-
-endif # ! 4.x
-endif # ! 3.x
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU
diff --git a/include/makeinclude/platform_tru64_kcc.GNU b/include/makeinclude/platform_tru64_kcc.GNU
index 7276f96f17e..0fe62b9c24d 100644
--- a/include/makeinclude/platform_tru64_kcc.GNU
+++ b/include/makeinclude/platform_tru64_kcc.GNU
@@ -3,30 +3,23 @@
 # This platform macros file is intended to work with
 # Digital UNIX using the KAI compiler.
 
-ifndef ACE_DU_VERSION
-  ACE_DU_VERSION := $(shell uname -r)
-endif # ACE_DU_VERSION
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU
 
-ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
+# Include the macro file for osf1_4.x
+#
+include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.x_kcc.GNU
 
-else # ! 3.x
 ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_kcc.GNU
-
-  ifeq (4.0F,$(findstring 4.0F,$(shell /usr/sbin/sizer -v)))
-    CFLAGS += -DDIGITAL_UNIX=0x40F
+  ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
     # variable "" was declared but never referenced.
     # Get these from PTHREAD_THIS_CATCH_NP.
     WARNING_FLAGS += --diag_suppress 177
-  else  # ! 4.0F
-    CFLAGS += -DDIGITAL_UNIX=0x400
   endif # ! 4.0F
 
 else # ! 4.x
 ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
-  include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0_kcc.GNU
-
   # variable "" was declared but never referenced.
   # Get these from PTHREAD_THIS_CATCH_NP.
   WARNING_FLAGS += --diag_suppress 177
@@ -34,16 +27,9 @@ ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
   # KCC makes a lot of these warnings from the C compiler.
   WARNING_FLAGS += --backend -msg_disable --backend nonstandcast,missingreturn,uninit1,ptrmismatch
 
-  ifndef ACE_DU_SUBVERSION
-    ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v)
-  endif # ! ACE_DU_SUBVERSION
-
-  ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION)))
-    CFLAGS += -DDIGITAL_UNIX=0x510
-  else
-    CFLAGS += -DDIGITAL_UNIX=0x500
-  endif
-
 endif # 5.x
 endif # ! 4.x
-endif # ! 3.x
+
+# Include the common macros for all compilers
+#
+include $(ACE_ROOT)/include/makeinclude/platform_tru64_post.GNU
diff --git a/include/makeinclude/platform_tru64_post.GNU b/include/makeinclude/platform_tru64_post.GNU
new file mode 100644
index 00000000000..52ccdc93d1a
--- /dev/null
+++ b/include/makeinclude/platform_tru64_post.GNU
@@ -0,0 +1,32 @@
+# $Id$
+
+# Common definitions which were in multiple files adding to the confusion
+
+# All versions of 4.x...Why doesn't Digital have 4.[a-z] ? That would be
+# more fun...
+
+ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
+  ifeq (4.0D,$(findstring 4.0D,$(ACE_DU_SUBVERSION)))
+    CFLAGS += -DDIGITAL_UNIX=0x40D
+  else
+    ifeq (4.0E,$(findstring 4.0E,$(ACE_DU_SUBVERSION)))
+      CFLAGS += -DDIGITAL_UNIX=0x40E
+    else
+      ifeq (4.0F,$(findstring 4.0F,$(ACE_DU_SUBVERSION)))
+        CFLAGS += -DDIGITAL_UNIX=0x40F
+      else
+        ifeq (4.0G,$(findstring 4.0G,$(ACE_DU_SUBVERSION)))
+          CFLAGS += -DDIGITAL_UNIX=0x40F # can't have 0x40G
+        else
+          CFLAGS += -DDIGITAL_UNIX=0x400
+        endif
+      endif
+    endif
+  endif
+else # ! 4.x
+  ifeq (V5.1,$(findstring V5.1,$(ACE_DU_SUBVERSION)))
+    CFLAGS += -DDIGITAL_UNIX=0x510
+  else
+    CFLAGS += -DDIGITAL_UNIX=0x500
+  endif
+endif # ! 5.x
diff --git a/include/makeinclude/platform_tru64_pre.GNU b/include/makeinclude/platform_tru64_pre.GNU
new file mode 100644
index 00000000000..318ba855258
--- /dev/null
+++ b/include/makeinclude/platform_tru64_pre.GNU
@@ -0,0 +1,11 @@
+# $Id$
+
+# Common definitions for all versions of Digital Unix.
+
+ifndef ACE_DU_VERSION
+  ACE_DU_VERSION := $(shell uname -r)
+endif # ! ACE_DU_VERSION
+
+ifndef ACE_DU_SUBVERSION
+  ACE_DU_SUBVERSION := $(shell /usr/sbin/sizer -v)
+endif # ! ACE_DU_SUBVERSION