[Boost-commit] svn:boost r61807 - trunk/boost/math/tools

Subject: [Boost-commit] svn:boost r61807 - trunk/boost/math/tools
From: john_at_[hidden]
Date: 2010-05-06 06:23:56

Author: johnmaddock
Date: 2010-05-06 06:23:56 EDT (Thu, 06 May 2010)
New Revision: 61807
URL: http://svn.boost.org/trac/boost/changeset/61807

Log:
Prevent multiple definitions of BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS.
Text files modified: 
   trunk/boost/math/tools/config.hpp |    10 +++++-----                              
   1 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/math/tools/config.hpp
==============================================================================
--- trunk/boost/math/tools/config.hpp	(original)
+++ trunk/boost/math/tools/config.hpp	2010-05-06 06:23:56 EDT (Thu, 06 May 2010)
@@ -23,11 +23,11 @@
 #include <boost/math/tools/user.hpp>
 #include <boost/math/special_functions/detail/round_fwd.hpp>
 
-#if defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
-   || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH)
+#if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
+   || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH)) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 #endif
-#if !defined(_GLIBCXX_USE_LONG_DOUBLE) && (defined(__GLIBCXX__) || defined(__GLIBCPP__))
+#if !defined(_GLIBCXX_USE_LONG_DOUBLE) && (defined(__GLIBCXX__) || defined(__GLIBCPP__)) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 #endif
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
@@ -41,14 +41,14 @@
 #  define BOOST_MATH_CONTROL_FP _control87(MCW_EM,MCW_EM)
 #  include <float.h>
 #endif
-#if (defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) && ((LDBL_MANT_DIG == 106) || (__LDBL_MANT_DIG__ == 106))
+#if (defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) && ((LDBL_MANT_DIG == 106) || (__LDBL_MANT_DIG__ == 106)) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 //
 // Darwin's rather strange "double double" is rather hard to
 // support, it should be possible given enough effort though...
 //
 #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 #endif
-#if defined(unix) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER <= 1000)
+#if defined(unix) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER <= 1000) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 //
 // Intel compiler prior to version 10 has sporadic problems
 // calling the long double overloads of the std lib math functions: