From cf5f69c2161bca7a927db6f2ae4e2258c6874eac Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 17 Jun 2009 21:23:42 +0000 Subject: [PATCH] Try to avoid using special macro handling code. [SVN r54025] --- .../hash/detail/float_functions.hpp | 38 +------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/include/boost/functional/hash/detail/float_functions.hpp b/include/boost/functional/hash/detail/float_functions.hpp index f766ec9..199123d 100644 --- a/include/boost/functional/hash/detail/float_functions.hpp +++ b/include/boost/functional/hash/detail/float_functions.hpp @@ -100,7 +100,8 @@ namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS { #define BOOST_HASH_CALL_FLOAT_FUNC(cpp_func, c99_func, type1, type2) \ namespace BOOST_HASH_DETECT_FLOAT_FUNCTIONS { \ template \ - boost::hash_detail::not_found c99_func(Float, type2); \ + boost::hash_detail::not_found c99_func \ + BOOST_PREVENT_MACRO_SUBSTITUTION (Float, type2); \ } \ \ namespace boost { \ @@ -163,48 +164,13 @@ namespace boost { \ } \ } -#define BOOST_HASH_CALL_FLOAT_MACRO(cpp_func, c99_func, type1, type2) \ -namespace boost { \ - namespace hash_detail { \ - \ - template <> \ - struct call_##cpp_func { \ - typedef type1 float_type; \ - inline type1 operator()(type1 x, type2 y) const { \ - return c99_func(x, y); \ - } \ - }; \ - } \ -} - -#if defined(ldexpf) -BOOST_HASH_CALL_FLOAT_MACRO(ldexp, ldexpf, float, int) -#else BOOST_HASH_CALL_FLOAT_FUNC(ldexp, ldexpf, float, int) -#endif - -#if defined(ldexpl) -BOOST_HASH_CALL_FLOAT_MACRO(ldexp, ldexpl, long double, int) -#else BOOST_HASH_CALL_FLOAT_FUNC(ldexp, ldexpl, long double, int) -#endif - -#if defined(frexpf) -BOOST_HASH_CALL_FLOAT_MACRO(frexp, frexpf, float, int*) -#else BOOST_HASH_CALL_FLOAT_FUNC(frexp, frexpf, float, int*) -#endif - -#if defined(frexpl) -BOOST_HASH_CALL_FLOAT_MACRO(frexp, frexpl, long double, int*) -#else BOOST_HASH_CALL_FLOAT_FUNC(frexp, frexpl, long double, int*) -#endif -#undef BOOST_HASH_CALL_FLOAT_MACRO #undef BOOST_HASH_CALL_FLOAT_FUNC - namespace boost { namespace hash_detail