merge trunk to release

[SVN r86727]
This commit is contained in:
Robert Ramey
2013-11-16 20:13:39 +00:00
parent bda94d16d1
commit b454953f27
148 changed files with 183 additions and 28350 deletions

View File

@@ -20,6 +20,7 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/limits.hpp>
#include <boost/math/special_functions/next.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
@@ -100,8 +101,8 @@ bool A::operator==(const A &rhs) const
&& t == rhs.t
&& u == rhs.u
&& v == rhs.v
&& std::fabs(w - rhs.w) <= std::numeric_limits<float>::round_error()
&& std::fabs(x - rhs.x) <= std::numeric_limits<float>::round_error()
&& std::abs( boost::math::float_distance(w, rhs.w)) < 2
&& std::abs( boost::math::float_distance(x, rhs.x)) < 2
;
}
@@ -115,10 +116,10 @@ bool A::operator<(const A &rhs) const
return t < rhs.u;
if(! (v == rhs.v) )
return t < rhs.v;
if(! (std::fabs(w - rhs.w) < std::numeric_limits<float>::round_error() ) )
return t < rhs.w;
if(! (std::fabs(x - rhs.x) < std::numeric_limits<float>::round_error() ) )
return t < rhs.x;
if(std::abs( boost::math::float_distance(w, rhs.w)) > 1)
return false;
if(std::abs( boost::math::float_distance(x, rhs.x)) > 1)
return false;
return false;
}