Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/math/tools/roots.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/tools/roots.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/math/tools/roots.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -109,13 +109,13 @@ static const char* function = "boost::math::tools::bisect<%1%>"; if(min >= max) { - policies::raise_evaluation_error(function, - "Arguments in wrong order in boost::math::tools::bisect (first arg=%1%)", min, pol); + return boost::math::detail::pair_from_single(policies::raise_evaluation_error(function, + "Arguments in wrong order in boost::math::tools::bisect (first arg=%1%)", min, pol)); } if(fmin * fmax >= 0) { - policies::raise_evaluation_error(function, - "No change of sign in boost::math::tools::bisect, either there is no root to find, or there are multiple roots in the interval (f(min) = %1%).", fmin, pol); + return boost::math::detail::pair_from_single(policies::raise_evaluation_error(function, + "No change of sign in boost::math::tools::bisect, either there is no root to find, or there are multiple roots in the interval (f(min) = %1%).", fmin, pol)); } // @@ -302,7 +302,7 @@ if(0 == f0) break; - if((f1 == 0) && (f2 == 0)) + if(f1 == 0) { // Oops zero derivative!!! #ifdef BOOST_MATH_INSTRUMENT