summaryrefslogtreecommitdiff
path: root/ace/config-lynxos.h
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-30 02:52:59 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-30 02:52:59 +0000
commitdd87730cc53a678965f05a2e2dd062e44c85fb2e (patch)
tree788030ca0b005f6aa273184dd7f590a8fe8d2c55 /ace/config-lynxos.h
parent3ab5e0a9c6776d36bdc5c78ca5ad90a24f0f7046 (diff)
downloadATCD-dd87730cc53a678965f05a2e2dd062e44c85fb2e.tar.gz
ChangeLogTag: Sun Aug 29 21:35:17 1999 David L. Levine <levine@cs.wustl.edu>
Diffstat (limited to 'ace/config-lynxos.h')
-rw-r--r--ace/config-lynxos.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 6a9ed5f79c5..3bd869b8848 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -18,17 +18,23 @@
#endif /* ! __ACE_INLINE__ */
#if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-
# if __GNUC_MINOR__ == 7
+
+# include "ace/config-g++-common.h"
+
// The g++ that's distributed with LynxOS 3.0.0 needs this.
// It won't hurt with 2.5.0.
# undef ACE_HAS_TEMPLATE_SPECIALIZATION
# elif __LYNXOS_SDK_VERSION <= 199603L
+ // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+ // this must appear before its #include.
+
// If ACE_HAS_STRING_CLASS is used with LynxOS 3.0.0, some
// executables, such as IOStream_Test, require linking with
// libg++.
# define ACE_HAS_STRING_CLASS
+
+# include "ace/config-g++-common.h"
# endif /* __GNUC_MINOR__ == 7 */
#endif /* __GNUG__ */