Author: sebor
Date: Sat Jul 30 15:12:40 2005
New Revision: 226585
URL: http://svn.apache.org/viewcvs?rev=226585&view=rev
Log:
Issue STDCXX-8:
2005-07-30 Nick Gunn <[EMAIL PROTECTED]>
* include/ansi/cfloat (LDBL_MAX, LDBL_MIN): Avoided re-defining
macros when using the EDG-based Intel C++ on Linux.
* include/ansi/float.h: Same; also keyed in on __linux__ instead
of __GLIBC__.
* etc/config/src/LIMITS.cpp (LDBL_EPSILON, LDBL_MAX, LDBL_MIN):
Same.
Modified:
incubator/stdcxx/trunk/etc/config/src/LIMITS.cpp
incubator/stdcxx/trunk/include/ansi/cfloat
incubator/stdcxx/trunk/include/ansi/float.h
Modified: incubator/stdcxx/trunk/etc/config/src/LIMITS.cpp
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/etc/config/src/LIMITS.cpp?rev=226585&r1=226584&r2=226585&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/src/LIMITS.cpp (original)
+++ incubator/stdcxx/trunk/etc/config/src/LIMITS.cpp Sat Jul 30 15:12:40 2005
@@ -16,9 +16,10 @@
#ifndef _RWSTD_NO_FLOAT_H
# include <float.h>
-# if defined (__EDG__) && defined (__linux__)
+# if defined (__EDG__) && defined (__linux__) && !defined (__INTEL_COMPILER)
- // gcc on Linux #defines these using its own propriterary __extension__
+ // prevent the propriterary gcc __extension__ from
+ // throwing the vanilla EDG demo for a loop
# undef LDBL_EPSILON
# undef LDBL_MIN
# undef LDBL_MAX
@@ -27,7 +28,7 @@
# define LDBL_EPSILON 1.0842021724855044e-19L
# define LDBL_MIN 3.3621031431120935e-4932L
# define LDBL_MAX 1.1897314953572317e+4932L
-# endif // defined (__EDG__) && defined (__linux__)
+# endif // __EDG__ && __linux__ && !__INTEL_COMPILER
#endif // _RWSTD_NO_FLOAT_H
Modified: incubator/stdcxx/trunk/include/ansi/cfloat
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/ansi/cfloat?rev=226585&r1=226584&r2=226585&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/cfloat (original)
+++ incubator/stdcxx/trunk/include/ansi/cfloat Sat Jul 30 15:12:40 2005
@@ -3,7 +3,7 @@
*
* cfloat - C++ Standard library interface to the ANSI C header float.h
*
- * $Id: //stdlib/dev/include/ansi/cfloat#14 $
+ * $Id$
*
***************************************************************************
*
@@ -57,7 +57,7 @@
#endif // _RWSTD_NO_DEPRECATED_C_HEADERS
-# if defined (__EDG__) && defined (__linux__)
+# if defined (__EDG__) && defined (__linux__) && !defined (__INTEL_COMPILER)
// avoid relying on dubious gcc extensions
# undef LDBL_MIN
@@ -65,6 +65,6 @@
# define LDBL_MIN _RWSTD_LDBL_MIN
# define LDBL_MAX _RWSTD_LDBL_MAX
-# endif // __EDG__ && __linux__
+# endif // __EDG__ && __linux__ && !__INTEL_COMPILER
#endif // _RWSTD_NO_PURE_C_HEADERS
Modified: incubator/stdcxx/trunk/include/ansi/float.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/ansi/float.h?rev=226585&r1=226584&r2=226585&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/ansi/float.h (original)
+++ incubator/stdcxx/trunk/include/ansi/float.h Sat Jul 30 15:12:40 2005
@@ -2,7 +2,7 @@
*
* float.h - C++ Standard library wrapper for the ANSI C library header
*
- * $Id: //stdlib/dev/include/ansi/float.h#12 $
+ * $Id$
*
***************************************************************************
*
@@ -26,7 +26,7 @@
#else
# include _RWSTD_ANSI_C_FLOAT_H
-# if defined (__EDG__) && defined (__GLIBC__)
+# if defined (__EDG__) && defined (__linux__) && !defined (__INTEL_COMPILER)
// avoid relying on dubious gcc extensions
# undef LDBL_MIN
@@ -34,6 +34,6 @@
# define LDBL_MIN _RWSTD_LDBL_MIN
# define LDBL_MAX _RWSTD_LDBL_MAX
-# endif // __EDG__ && __GLIBC__
+# endif // __EDG__ && __linux__ && !__INTEL_COMPILER
#endif // _RWSTD_NO_DEPRECATED_C_HEADERS
