summaryrefslogtreecommitdiff
path: root/ace/config-vxworks5.x.h
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-02-04 04:18:46 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-02-04 04:18:46 +0000
commitc753510538938de381d668189fc9af733b319010 (patch)
tree95ca5f942efd33dde479c4bd7581c223b399ef53 /ace/config-vxworks5.x.h
parentb29fb41e2acfc56e6ebdb1eb3fa100fd9757656d (diff)
downloadATCD-c753510538938de381d668189fc9af733b319010.tar.gz
With Green Hills, only #define ACE_HAS_STANDARD_CPP_LIBRARY (to 1)
if __STANDARD_CXX is #defined
Diffstat (limited to 'ace/config-vxworks5.x.h')
-rw-r--r--ace/config-vxworks5.x.h21
1 files changed, 6 insertions, 15 deletions
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index f5dfb92368e..819acdccb38 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -4,17 +4,7 @@
// The following configuration file is designed to work for VxWorks
// 5.2/5.3 platforms using one of these compilers:
// 1) The GNU/Cygnus g++ compiler that is shipped with Tornado 1.0.1.
-// 2) The GreenHills 1.8.8 (not 1.8.7!!!!) and 1.8.9 compilers.
-// NOTE: if you're using GreenHills 1.8.9, you'll have to
-// uncomment the #define ACE_HAS_STANDARD_CPP_LIBRARY 1
-// line below! Or, use an ace/config.h that looks like:
-//
-// #ifndef ACE_CONFIG_H
-// // ACE_CONFIG_H is defined by the following #included header.
-//
-// #include "ace/config-vxworks5.x.h"
-// #define ACE_HAS_STANDARD_CPP_LIBRARY 1
-// #endif /* ACE_CONFIG_H */
+// 2) The Green Hills 1.8.8 (not 1.8.7!!!!) and 1.8.9 compilers.
#ifndef ACE_CONFIG_H
#define ACE_CONFIG_H
@@ -52,7 +42,7 @@
// include iostream.h only where they need it.
# define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
#elif defined (ghs)
- // Processor type, if necessary. GreenHills defines "ppc".
+ // Processor type, if necessary. Green Hills defines "ppc".
# if defined (ppc)
# define ACE_HAS_POWERPC_TIMER
# endif /* ppc */
@@ -66,9 +56,10 @@
# define ACE_HAS_PENTIUM
# endif /* i386 */
-// The following #define is necessary with 1.8.9, but can't be used
-// with 1.8.8.
-// # define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# if defined (__STANDARD_CXX)
+ // Green Hills 1.8.9, but not 1.8.8.
+# define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# endif /* __STANDARD_CXX */
# define ACE_HAS_BROKEN_ENUMS /* Necessary with 1.8.9, harmless with 1.8.8. */
# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA