diff --git a/src/ai/contexts.cpp b/src/ai/contexts.cpp index 71eae0b798f6..ea6216085df6 100644 --- a/src/ai/contexts.cpp +++ b/src/ai/contexts.cpp @@ -1119,7 +1119,7 @@ double readonly_context_impl::power_projection(const map_location& loc, const mo } // The 0.5 power avoids underestimating too much the damage of a wounded unit. - int64_t hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000); + int64_t hp = int(std::sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000); int64_t most_damage = 0; for(const attack_type &att : un.attacks()) { diff --git a/src/ai/default/recruitment.cpp b/src/ai/default/recruitment.cpp index e912da883dfb..562f32b447f5 100644 --- a/src/ai/default/recruitment.cpp +++ b/src/ai/default/recruitment.cpp @@ -975,7 +975,7 @@ void recruitment::do_combat_analysis(std::vector* leader_data) { for (const std::string& recruit : leader.recruits) { double score = compare_unit_types(recruit, enemy_unit); score *= enemy_unit_hp; - score = pow(score, COMBAT_SCORE_POWER); + score = std::pow(score, COMBAT_SCORE_POWER); temp_scores[recruit] += score; } } diff --git a/src/display.cpp b/src/display.cpp index 704330e93dad..fa34ccf6d261 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -1302,7 +1302,7 @@ void display::scroll_to_xy(int screenxpos, int screenypos, SCROLL_TYPE scroll_ty int x_old = 0; int y_old = 0; - const double dist_total = hypot(xmove, ymove); + const double dist_total = std::hypot(xmove, ymove); double dist_moved = 0.0; int t_prev = SDL_GetTicks(); diff --git a/src/formula/function.cpp b/src/formula/function.cpp index 577d1ceb9ceb..6425c078bc8e 100644 --- a/src/formula/function.cpp +++ b/src/formula/function.cpp @@ -491,21 +491,21 @@ DEFINE_WFL_FUNCTION(str_lower, 1, 1) DEFINE_WFL_FUNCTION(sin, 1, 1) { const double angle = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = sin(angle * pi() / 180.0); + const double result = std::sin(angle * pi() / 180.0); return variant(result, variant::DECIMAL_VARIANT); } DEFINE_WFL_FUNCTION(cos, 1, 1) { const double angle = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = cos(angle * pi() / 180.0); + const double result = std::cos(angle * pi() / 180.0); return variant(result, variant::DECIMAL_VARIANT); } DEFINE_WFL_FUNCTION(tan, 1, 1) { const double angle = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = tan(angle * pi() / 180.0); + const double result = std::tan(angle * pi() / 180.0); if(std::isnan(result) || result <= INT_MIN || result >= INT_MAX) { return variant(); } @@ -516,7 +516,7 @@ DEFINE_WFL_FUNCTION(tan, 1, 1) DEFINE_WFL_FUNCTION(asin, 1, 1) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = asin(num) * 180.0 / pi(); + const double result = std::asin(num) * 180.0 / pi(); if(std::isnan(result)) { return variant(); } @@ -527,7 +527,7 @@ DEFINE_WFL_FUNCTION(asin, 1, 1) DEFINE_WFL_FUNCTION(acos, 1, 1) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = acos(num) * 180.0 / pi(); + const double result = std::acos(num) * 180.0 / pi(); if(std::isnan(result)) { return variant(); } @@ -538,14 +538,14 @@ DEFINE_WFL_FUNCTION(acos, 1, 1) DEFINE_WFL_FUNCTION(atan, 1, 1) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = atan(num) * 180.0 / pi(); + const double result = std::atan(num) * 180.0 / pi(); return variant(result, variant::DECIMAL_VARIANT); } DEFINE_WFL_FUNCTION(sqrt, 1, 1) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = sqrt(num); + const double result = std::sqrt(num); if(std::isnan(result)) { return variant(); } @@ -556,7 +556,7 @@ DEFINE_WFL_FUNCTION(sqrt, 1, 1) DEFINE_WFL_FUNCTION(cbrt, 1, 1) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = num < 0 ? -pow(-num, 1.0 / 3.0) : pow(num, 1.0 / 3.0); + const double result = num < 0 ? -std::pow(-num, 1.0 / 3.0) : std::pow(num, 1.0 / 3.0); return variant(result, variant::DECIMAL_VARIANT); } @@ -564,7 +564,7 @@ DEFINE_WFL_FUNCTION(root, 2, 2) { const double base = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; const double root = args()[1]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = base < 0 && fmod(root, 2) == 1 ? -pow(-base, 1.0 / root) : pow(base, 1.0 / root); + const double result = base < 0 && std::fmod(root, 2) == 1 ? -std::pow(-base, 1.0 / root) : std::pow(base, 1.0 / root); if(std::isnan(result)) { return variant(); } @@ -576,7 +576,7 @@ DEFINE_WFL_FUNCTION(log, 1, 2) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; if(args().size() == 1) { - const double result = log(num); + const double result = std::log(num); if(std::isnan(result)) { return variant(); } @@ -585,7 +585,7 @@ DEFINE_WFL_FUNCTION(log, 1, 2) } const double base = args()[1]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = log(num) / log(base); + const double result = std::log(num) / std::log(base); if(std::isnan(result)) { return variant(); } @@ -596,7 +596,7 @@ DEFINE_WFL_FUNCTION(log, 1, 2) DEFINE_WFL_FUNCTION(exp, 1, 1) { const double num = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; - const double result = exp(num); + const double result = std::exp(num); if(result == 0 || result >= INT_MAX) { // These are range errors rather than NaNs, // but I figure it's better than returning INT_MIN. @@ -617,7 +617,7 @@ DEFINE_WFL_FUNCTION(hypot, 2, 2) { const double x = args()[0]->evaluate(variables, fdb).as_decimal() / 1000.0; const double y = args()[1]->evaluate(variables, fdb).as_decimal() / 1000.0; - return variant(hypot(x, y), variant::DECIMAL_VARIANT); + return variant(std::hypot(x, y), variant::DECIMAL_VARIANT); } DEFINE_WFL_FUNCTION(index_of, 2, 2) @@ -677,7 +677,7 @@ DEFINE_WFL_FUNCTION(wave, 1, 1) { const int value = args()[0]->evaluate(variables, fdb).as_int() % 1000; const double angle = 2.0 * pi() * (static_cast(value) / 1000.0); - return variant(static_cast(sin(angle) * 1000.0)); + return variant(static_cast(std::sin(angle) * 1000.0)); } namespace diff --git a/src/formula/variant.cpp b/src/formula/variant.cpp index 4cd02a0ad391..3214f7f3e487 100644 --- a/src/formula/variant.cpp +++ b/src/formula/variant.cpp @@ -469,7 +469,7 @@ variant variant::operator^(const variant& v) const { if(is_decimal() || v.is_decimal()) { - double res = pow(as_decimal() / 1000.0 , v.as_decimal() / 1000.0); + double res = std::pow(as_decimal() / 1000.0 , v.as_decimal() / 1000.0); if(std::isnan(res)) { return variant(); @@ -478,7 +478,7 @@ variant variant::operator^(const variant& v) const return variant(res, DECIMAL_VARIANT); } - return variant(static_cast(round_portable(pow(static_cast(as_int()), v.as_int())))); + return variant(static_cast(round_portable(std::pow(static_cast(as_int()), v.as_int())))); } variant variant::operator-() const diff --git a/src/gui/widgets/generator.cpp b/src/gui/widgets/generator.cpp index af25b74160da..62fa81acf8ca 100644 --- a/src/gui/widgets/generator.cpp +++ b/src/gui/widgets/generator.cpp @@ -552,7 +552,7 @@ point table::calculate_best_size() const */ std::size_t n_items = get_item_count(); - std::size_t max_cols = sqrt(n_items) + 2; + std::size_t max_cols = std::sqrt(n_items) + 2; std::vector item_sizes; for(std::size_t i = 0; i < n_items; i++) { diff --git a/src/joystick.cpp b/src/joystick.cpp index f465e21d9982..88e8901d60a3 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -133,7 +133,7 @@ std::pair joystick_manager::get_mouse_axis_pair() { thrust = get_thrusta_axis(); } - const int radius = round_double(sqrt(pow(values.first, 2.0f) + pow(values.second, 2.0f))); + const int radius = round_double(std::sqrt(std::pow(values.first, 2.0f) + std::pow(values.second, 2.0f))); const int deadzone = preferences::joystick_mouse_deadzone(); const double multiplier = 1.0 + thrust; @@ -169,7 +169,7 @@ std::pair joystick_manager::get_scroll_axis_pair() { thrust = get_thrusta_axis(); } - const int radius = round_double(sqrt(pow(values.first, 2.0f) + pow(values.second, 2.0f))); + const int radius = round_double(std::sqrt(std::pow(values.first, 2.0f) + std::pow(values.second, 2.0f))); const int deadzone = preferences::joystick_scroll_deadzone(); const double multiplier = 1.0 + thrust; @@ -218,7 +218,7 @@ std::pair joystick_manager::get_cursor_polar_coordinates() { std::pair joystick_manager::get_polar_coordinates(int joystick_xaxis, int xaxis, int joystick_yaxis, int yaxis) { const std::pair values = get_axis_pair(joystick_xaxis, xaxis, joystick_yaxis, yaxis); - const double radius = (sqrt(pow(values.first, 2.0f) + pow(values.second, 2.0f))) / 32768.0; + const double radius = (std::sqrt(std::pow(values.first, 2.0f) + std::pow(values.second, 2.0f))) / 32768.0; const double angle = (atan2( static_cast(values.second) , static_cast(values.first))) * 180.0 / pi(); @@ -275,7 +275,7 @@ bool joystick_manager::update_highlighted_hex(map_location& highlighted_hex, con const int x_axis = values.first; const int y_axis = values.second; - //const int radius = round_double(sqrt(pow(x_axis, 2.0f) + pow(y_axis, 2.0f))); + //const int radius = round_double(std::(std::pow(x_axis, 2.0f) + std::pow(y_axis, 2.0f))); // const int deadzone = preferences::joystick_cursor_deadzone(); //const int threshold2 = 10*threshold; @@ -310,7 +310,7 @@ bool joystick_manager::update_highlighted_hex(map_location& highlighted_hex) { const int x_axis = values.first; const int y_axis = values.second; - const int radius = round_double(sqrt(pow(x_axis, 2.0f) + pow(y_axis, 2.0f))); + const int radius = round_double(std::sqrt(std::pow(x_axis, 2.0f) + std::pow(y_axis, 2.0f))); const int deadzone = preferences::joystick_cursor_deadzone(); const int threshold = deadzone + preferences::joystick_cursor_threshold(); diff --git a/src/sdl/utils.cpp b/src/sdl/utils.cpp index 52848412a3f5..ce07014db30a 100644 --- a/src/sdl/utils.cpp +++ b/src/sdl/utils.cpp @@ -1855,8 +1855,8 @@ surface rotate_any_surface(const surface& surf, float angle, int zoom, int offse float max_x, max_y; // convert angle to radiant (angle * 2 * PI) / 360 const float radians = angle * boost::math::constants::pi() / 180; - cosine = cos(radians); - sine = sin(radians); + cosine = std::cos(radians); + sine = std::sin(radians); // calculate the size of the dst image src_w = surf->w * zoom; src_h = surf->h * zoom; diff --git a/src/tests/test_formula_function.cpp b/src/tests/test_formula_function.cpp index c961bc4950bd..29de48e50b03 100644 --- a/src/tests/test_formula_function.cpp +++ b/src/tests/test_formula_function.cpp @@ -161,14 +161,14 @@ BOOST_AUTO_TEST_CASE(test_formula_function_math) BOOST_CHECK_EQUAL(formula("log(8,2)").evaluate().as_int(), 3); BOOST_CHECK_EQUAL(formula("log(12)").evaluate().as_decimal(), - static_cast(round(1000.0 * log(12)))); + static_cast(round(1000.0 * std::log(12)))); BOOST_CHECK_EQUAL(formula("exp(3)").evaluate().as_decimal(), - static_cast(round(1000.0 * exp(3)))); + static_cast(round(1000.0 * std::exp(3)))); } BOOST_AUTO_TEST_CASE(test_formula_function_trig) { - const double pi = 4. * atan(1.); + const double pi = 4. * std::atan(1.); map_formula_callable variables; @@ -178,12 +178,12 @@ BOOST_AUTO_TEST_CASE(test_formula_function_trig) BOOST_CHECK_EQUAL( formula("sin(x)") .evaluate(variables).as_decimal() - , static_cast(round(1000. * sin(x * pi / 180.)))); + , static_cast(round(1000. * std::sin(x * pi / 180.)))); BOOST_CHECK_EQUAL( formula("cos(x)") .evaluate(variables).as_decimal() - , static_cast(round(1000. * cos(x * pi / 180.)))); + , static_cast(round(1000. * std::cos(x * pi / 180.)))); if(x % 90 == 0 && x % 180 != 0) { BOOST_CHECK( @@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE(test_formula_function_trig) BOOST_CHECK_EQUAL( formula("tan(x)") .evaluate(variables).as_decimal(), - static_cast(round(1000. * tan(x * pi / 180.)))); + static_cast(round(1000. * std::tan(x * pi / 180.)))); } } }