3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 20:27:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1854 from neheb/patch-1

Browse Source 
catch_compiler_capabilities.h: use proper math define
This commit is contained in:
Martin Hořeňovský
2020-02-03 11:26:31 +01:00
committed by GitHub
parent 1715b6b923 2652bb86e3
commit b3b07215d1
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_compiler_capabilities.h
View File

@@ -203,7 +203,7 @@
#define CATCH_CONFIG_COLOUR_NONE #define CATCH_CONFIG_COLOUR_NONE
#endif #endif
#if defined(__UCLIBC__) #if !defined(_GLIBCXX_USE_C99_MATH_TR1)
#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER #define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
#endif #endif

18
include/internal/catch_matchers_floating.cpp
View File

@@ -59,16 +59,8 @@ namespace {
return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff; return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
} }
} //end anonymous namespace
#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER) #if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
#if defined(__clang__)
#pragma clang diagnostic push
// The long double overload is currently unused
#pragma clang diagnostic ignored "-Wunused-function"
#endif
float nextafter(float x, float y) { float nextafter(float x, float y) {
return ::nextafterf(x, y); return ::nextafterf(x, y);
} }
@@ -77,18 +69,8 @@ namespace {
return ::nextafter(x, y); return ::nextafter(x, y);
} }
long double nextafter(long double x, long double y) {
return ::nextafterl(x, y);
}
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^ #endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
namespace {
template <typename FP> template <typename FP>
FP step(FP start, FP direction, uint64_t steps) { FP step(FP start, FP direction, uint64_t steps) {
for (uint64_t i = 0; i < steps; ++i) { for (uint64_t i = 0; i < steps; ++i) {