Merge fixes from Trunk.

Fixes #2392. Change includes of <cmath> to <boost/config/no_tr1/config.hpp>. Previously if Boost.TR1 was in the include path then including <cmath> pulls in all the new TR1 math functions, which in turn also requires linking to an external library. With auto-linking support this requires that library to have been built and be present in the library search path, even if the actual library under use is header only. [SVN r49314]
Always use c99 float function overloads when using Dinkumware with Visual C++,
2008-10-13 09:00:03 +00:00 · 2008-09-11 18:28:51 +00:00
1 changed files with 8 additions and 4 deletions
--- a/include/boost/functional/detail/float_functions.hpp
+++ b/include/boost/functional/detail/float_functions.hpp
@@ -6,7 +6,7 @@
 #if !defined(BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP)
 #define BOOST_FUNCTIONAL_DETAIL_FLOAT_FUNCTIONS_HPP

-#include <cmath>
+#include <boost/config/no_tr1/cmath.hpp>

 #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
@@ -61,9 +61,13 @@

 // Dinkumware.
 #elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
-// Overloaded float functions were probably introduced in an earlier version
-// than this.
-#  if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 402)
+// Some versions of Visual C++ don't seem to have the C++ overloads but they
+// all seem to have the c99 float overloads
+#  if defined(BOOST_MSVC)
+#    define BOOST_HASH_USE_C99_FLOAT_FUNCS
+// On other platforms the C++ overloads seem to have been introduced sometime
+// before 402.
+#  elif defined(_CPPLIB_VER) && (_CPPLIB_VER >= 402)
 #    define BOOST_HASH_USE_OVERLOAD_FLOAT_FUNCS
 #  else
 #    define BOOST_HASH_USE_C99_FLOAT_FUNCS