fix some conversion warnings by using std::abs() instead of fabs()

This commit is contained in:
arvidn 2018-08-09 00:22:45 +02:00 committed by Arvid Norberg
parent f1d2105afb
commit 28bd7102be
2 changed files with 6 additions and 6 deletions

View File

@ -167,9 +167,9 @@ void run_test(connections_t& v
} }
} }
bool close_to(float val, float comp, float err) bool close_to(float const val, float const comp, float const err)
{ {
return fabs(val - comp) <= err; return std::abs(val - comp) <= err;
} }
void spawn_connections(connections_t& v, bandwidth_manager& bwm void spawn_connections(connections_t& v, bandwidth_manager& bwm

View File

@ -1021,8 +1021,8 @@ void test_scrape(address(&rand_addr)())
std::printf("seeds: %f\n", double(seeds.size())); std::printf("seeds: %f\n", double(seeds.size()));
std::printf("downloaders: %f\n", double(downloaders.size())); std::printf("downloaders: %f\n", double(downloaders.size()));
TEST_CHECK(fabs(seeds.size() - 50.f) <= 3.f); TEST_CHECK(std::abs(seeds.size() - 50.f) <= 3.f);
TEST_CHECK(fabs(downloaders.size() - 50.f) <= 3.f); TEST_CHECK(std::abs(downloaders.size() - 50.f) <= 3.f);
} }
else else
{ {
@ -1187,7 +1187,7 @@ TORRENT_TEST(bloom_filter)
std::printf("%s\n", aux::to_hex(bf_str).c_str()); std::printf("%s\n", aux::to_hex(bf_str).c_str());
if (supports_ipv6()) if (supports_ipv6())
{ {
TEST_CHECK(double(fabs(test.size() - 1224.93f)) < 0.001); TEST_CHECK(std::abs(double(test.size()) - 1224.93) < 0.001);
TEST_CHECK(aux::to_hex(bf_str) == TEST_CHECK(aux::to_hex(bf_str) ==
"f6c3f5eaa07ffd91bde89f777f26fb2b" "f6c3f5eaa07ffd91bde89f777f26fb2b"
"ff37bdb8fb2bbaa2fd3ddde7bacfff75" "ff37bdb8fb2bbaa2fd3ddde7bacfff75"
@ -1208,7 +1208,7 @@ TORRENT_TEST(bloom_filter)
} }
else else
{ {
TEST_CHECK(double(fabs(test.size() - 257.854f)) < 0.001); TEST_CHECK(std::abs(double(test.size()) - 257.854) < 0.001);
TEST_CHECK(aux::to_hex(bf_str) == TEST_CHECK(aux::to_hex(bf_str) ==
"24c0004020043000102012743e004800" "24c0004020043000102012743e004800"
"37110820422110008000c0e302854835" "37110820422110008000c0e302854835"