summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE-INSTALL.html10
-rw-r--r--ChangeLog-99b18
-rw-r--r--ace/config-osf1-4.0.h2
-rw-r--r--ace/config-osf1.h6
-rw-r--r--ace/config-tru64.h6
5 files changed, 25 insertions, 17 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 62f32726495..915e26be5bc 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -394,12 +394,12 @@ make: *** [libACE.so] Error 8
V6.1-022 or later.<p>
NOTE: if you use Digital UNIX 4.0f or later, you <strong>must</strong>
- use <code>ace/config-osf1.h</code> instead of
- <code>ace/config-osf1-4.0.h</code>. <code>ace/config-osf1.h</code>
+ use <code>ace/config-tru64.h</code> instead of
+ <code>ace/config-osf1-4.0.h</code>. <code>ace/config-tru64.h</code>
can be used for all supported compilers on any version of
- Digital UNIX after and include 4.0. And, with 4.0f and later, you
- <strong>must</strong> use
- <code>include/makeinclude/platform_osf1_cxx.GNU</code> instead of
+ Digital UNIX after and include 4.0. And, with 4.0f and later when
+ using Digital CXX, you <strong>must</strong> use
+ <code>include/makeinclude/platform_tru64_cxx.GNU</code> instead of
<code>include/makeinclude/platform_osf1_4.0.GNU</code>.
GNU gcc 2.7.2.1 compiles without problems. All tests run
diff --git a/ChangeLog-99b b/ChangeLog-99b
index c18e2e4d9a2..71516e1dc8d 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,9 +1,17 @@
+Thu Jul 15 07:33:30 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/config-tru64.h,config-osf1.h,config-osf1-4.0.h,
+ include/makeinclude/platform_tru64_cxx.GNU,platform_osf1_cxx.GNU,
+ ACE-INSTALL.html: moved config-osf1.h to config-tru64.h,
+ and platform_osf1_cxx.GNU to platform_tru64_cxx.GNU.
+ Thanks to Doug Anderson <dla@home.com> for this suggestion.
+
Wed Jul 14 22:23:10 1999 David L. Levine <levine@cs.wustl.edu>
* ace/config-cray.h: replaced ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
with ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION. The standard
"template class" explicit instantiations work with version
- 3.2.0.1 of the compiler. Thanks to Doug Anderson <doug@clark.net>
+ 3.2.0.1 of the compiler. Thanks to Doug Anderson <dla@home.com>
for reporting this.
* ace/config-ghs-common.h: use
@@ -15,7 +23,7 @@ Wed Jul 14 22:03:08 1999 David L. Levine <levine@cs.wustl.edu>
* ace/config-osf1-4.0.h: enable pragma message disable declbutnotref
with Digital Unix 4.0f, as well as 5.0. Thanks to
- Doug Anderson <doug@clark.net> for reporting that
+ Doug Anderson <dla@home.com> for reporting that
it's necessary.
* ACE-INSTALL.html: updated config/platform info for
@@ -2484,7 +2492,7 @@ Thu Jun 24 22:42:44 1999 David L. Levine <levine@cs.wustl.edu>
preprocessor usage so that it's not in the middle of the
ACE_reintepret_cast.
-Thu Jun 24 22:18:52 1999 Doug Anderson <doug@clark.net>
+Thu Jun 24 22:18:52 1999 Doug Anderson <dla@home.com>
* ace/CDR_Stream.*,ace/SOCK_Dgram_Mcast.cpp,ace/config-cray.h:
updates for Cray UNICOS port.
@@ -8278,7 +8286,7 @@ Wed Mar 10 11:05:39 1999 David L. Levine <levine@cs.wustl.edu>
it was missing.
* include/makeinclude/platform_osf1_4.0.GNU: disable msg 1136 with
- cxx 6.1-029. Thanks to Doug Anderson <doug@clark.net> for
+ cxx 6.1-029. Thanks to Doug Anderson <dla@home.com> for
reporting this.
Wed Mar 10 10:57:16 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
@@ -10263,7 +10271,7 @@ Fri Jan 29 14:49:37 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* tests/Message_Queue_Test.cpp:
* tests/SV_Shared_Memory_Test.cpp:
* tests/run_tests.sh:
- Thanks to Doug Anderson <doug@clark.net> for this port of ACE to
+ Thanks to Doug Anderson <dla@home.com> for this port of ACE to
Cray machines.
Fri Jan 29 13:51:40 1999 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 46c04bfd9d9..8321aedbb6e 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -2,7 +2,7 @@
// $Id$
// NOTE: if you are using Digital UNIX V4.0f or later, you must
-// use config-osf1.h instead of directly using this config file.
+// use config-tru64.h instead of directly using this config file.
// The following configuration file is designed to work for the
// Digital UNIX V4.0a through V4.0d with either the GNU g++, DEC
diff --git a/ace/config-osf1.h b/ace/config-osf1.h
index 77cf85bd1a0..635e2775798 100644
--- a/ace/config-osf1.h
+++ b/ace/config-osf1.h
@@ -5,8 +5,8 @@
// Digital UNIX V4.0a and later platforms. It relies on
// config-osf1-4.0.h, and adds deltas for newer platforms.
-#ifndef ACE_CONFIG_OSF1_H
-#define ACE_CONFIG_OSF1_H
+#ifndef ACE_CONFIG_TRU64_H
+#define ACE_CONFIG_TRU64_H
#if defined (DIGITAL_UNIX)
# include "ace/config-osf1-4.0.h"
@@ -18,4 +18,4 @@
# include "ace/config-osf1-3.2.h"
#endif /* ! DIGITAL_UNIX */
-#endif /* ACE_CONFIG_OSF1_H */
+#endif /* ACE_CONFIG_TRU64_H */
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
index 77cf85bd1a0..635e2775798 100644
--- a/ace/config-tru64.h
+++ b/ace/config-tru64.h
@@ -5,8 +5,8 @@
// Digital UNIX V4.0a and later platforms. It relies on
// config-osf1-4.0.h, and adds deltas for newer platforms.
-#ifndef ACE_CONFIG_OSF1_H
-#define ACE_CONFIG_OSF1_H
+#ifndef ACE_CONFIG_TRU64_H
+#define ACE_CONFIG_TRU64_H
#if defined (DIGITAL_UNIX)
# include "ace/config-osf1-4.0.h"
@@ -18,4 +18,4 @@
# include "ace/config-osf1-3.2.h"
#endif /* ! DIGITAL_UNIX */
-#endif /* ACE_CONFIG_OSF1_H */
+#endif /* ACE_CONFIG_TRU64_H */