Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/math/concepts/real_concept.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
| author | Chris Cannam |
|---|---|
| date | Mon, 07 Sep 2015 11:12:49 +0100 |
| parents | 2665513ce2d3 |
| children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/math/concepts/real_concept.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/math/concepts/real_concept.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -85,7 +85,7 @@ real_concept(double c) : m_value(c){} real_concept(long double c) : m_value(c){} #ifdef BOOST_MATH_USE_FLOAT128 - real_concept(__float128 c) : m_value(c){} + real_concept(BOOST_MATH_FLOAT128_TYPE c) : m_value(c){} #endif // Assignment: @@ -307,7 +307,7 @@ is >> v; a = v; return is; -#elif defined(__SGI_STL_PORT) || defined(_RWSTD_VER) || defined(__LIBCOMO__) +#elif defined(__SGI_STL_PORT) || defined(_RWSTD_VER) || defined(__LIBCOMO__) || defined(_LIBCPP_VERSION) std::string s; real_concept_base_type d; is >> s; @@ -328,7 +328,7 @@ { template <> -inline concepts::real_concept make_big_value<concepts::real_concept>(long double val, const char* , mpl::false_ const&, mpl::false_ const&) +inline concepts::real_concept make_big_value<concepts::real_concept>(boost::math::tools::largest_float val, const char* , mpl::false_ const&, mpl::false_ const&) { return val; // Can't use lexical_cast here, sometimes it fails.... }