From 1167bc3c3c36adda78f9d5358f032dd69e561886 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 7 Nov 2016 11:00:00 +1100 Subject: [PATCH] Convert uses of fabs to std::fabs --- src/attack_prediction.cpp | 4 ++-- src/controller_base.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/attack_prediction.cpp b/src/attack_prediction.cpp index 6dac7b1764e..30c64cab632 100644 --- a/src/attack_prediction.cpp +++ b/src/attack_prediction.cpp @@ -2055,13 +2055,13 @@ void combatant::fight(combatant &opp, bool levelup_considered) assert(summary[0].size() == res.size()); assert(opp.summary[0].size() == opp_res.size()); for (unsigned int i = 0; i < summary[0].size(); ++i) { - if (fabs(summary[0][i] - res[i]) > 0.000001) { + if (std::fabs(summary[0][i] - res[i]) > 0.000001) { std::cerr << "Mismatch for " << i << " hp: " << summary[0][i] << " should have been " << res[i] << "\n"; assert(0); } } for (unsigned int i = 0; i < opp.summary[0].size(); ++i) { - if (fabs(opp.summary[0][i] - opp_res[i])> 0.000001) { + if (std::fabs(opp.summary[0][i] - opp_res[i])> 0.000001) { std::cerr << "Mismatch for " << i << " hp: " << opp.summary[0][i] << " should have been " << opp_res[i] << "\n"; assert(0); } diff --git a/src/controller_base.cpp b/src/controller_base.cpp index 197a8ba96b0..16a37d331e1 100644 --- a/src/controller_base.cpp +++ b/src/controller_base.cpp @@ -182,8 +182,8 @@ bool controller_base::handle_scroll(int mousex, int mousey, int mouse_flags, dou const double x_diff = (mousex - original_loc.x); const double y_diff = (mousey - original_loc.y); - if (fabs(x_diff) > snap_dist || fabs(y_diff) <= snap_dist) dx += speed * x_diff; - if (fabs(y_diff) > snap_dist || fabs(x_diff) <= snap_dist) dy += speed * y_diff; + if (std::fabs(x_diff) > snap_dist || std::fabs(y_diff) <= snap_dist) dx += speed * x_diff; + if (std::fabs(y_diff) > snap_dist || std::fabs(x_diff) <= snap_dist) dy += speed * y_diff; } } else { // Event may fire mouse down out of order with respect to initial click