diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h index 469248700..0703be8bc 100644 --- a/Contractor/Contractor.h +++ b/Contractor/Contractor.h @@ -45,8 +45,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#include - #include #include #include @@ -732,7 +730,7 @@ private: if ( priority > targetPriority ) return false; //tie breaking - if ( fabs(priority - targetPriority) < std::numeric_limits::epsilon() && bias(node, target) ) { + if ( std::abs(priority - targetPriority) < std::numeric_limits::epsilon() && bias(node, target) ) { return false; } neighbours.push_back( target ); @@ -754,7 +752,7 @@ private: if ( priority > targetPriority) return false; //tie breaking - if ( fabs(priority - targetPriority) < std::numeric_limits::epsilon() && bias(node, target) ) { + if ( std::abs(priority - targetPriority) < std::numeric_limits::epsilon() && bias(node, target) ) { return false; } } diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 9c727fb46..9cd4b10c3 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -923,7 +923,7 @@ private: } inline bool DoubleEpsilonCompare(const double d1, const double d2) const { - return (std::fabs(d1 - d2) < std::numeric_limits::epsilon() ); + return (std::abs(d1 - d2) < std::numeric_limits::epsilon() ); } }; diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index cf3114ad1..c1ef1326c 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -87,7 +87,7 @@ void ExtractorCallbacks::wayFunction(ExtractionWay &parsed_way) { parsed_way.speed = parsed_way.duration/(parsed_way.path.size()-1); } - if(std::numeric_limits::epsilon() >= fabs(-1. - parsed_way.speed)){ + if(std::numeric_limits::epsilon() >= std::abs(-1. - parsed_way.speed)){ SimpleLogger().Write(logDEBUG) << "found way with bogus speed, id: " << parsed_way.id; return;