Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define wxIsNaN() as std::isnan() in C++11 mode

Browse Source 
std::isnan() is always available when using C++11, so just use it.

Also pout the test for C++11 implementations of both wxIsNaN() and wxFinite()
first, eventually the rest of the checks will become obsolete and will be
removed.

Closes https://github.com/wxWidgets/wxWidgets/pull/283
This commit is contained in:
Benjamin Drung
2016-05-13 23:18:41 +02:00
committed by Vadim Zeitlin
parent a5d2f53f41
commit bc41cbeb25
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/math.h
View File

@@ -53,11 +53,18 @@
#ifdef __cplusplus #ifdef __cplusplus
/* Any C++11 compiler should provide isfinite() */ /*
Things are simple with C++11: we have everything we need in std.
Eventually we will only have this section and not the legacy stuff below.
*/
#if __cplusplus >= 201103 #if __cplusplus >= 201103
#include <cmath> #include <cmath>
#define wxFinite(x) std::isfinite(x) #define wxFinite(x) std::isfinite(x)
#elif defined(__VISUALC__) || defined(__BORLANDC__) #define wxIsNaN(x) std::isnan(x)
#else /* C++98 */
#if defined(__VISUALC__) || defined(__BORLANDC__)
#include <float.h> #include <float.h>
#define wxFinite(x) _finite(x) #define wxFinite(x) _finite(x)
#elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__) #elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__)
@@ -97,6 +104,8 @@
#define wxIsNaN(x) ((x) != (x)) #define wxIsNaN(x) ((x) != (x))
#endif #endif
#endif /* C++11/C++98 */
#ifdef __INTELC__ #ifdef __INTELC__
inline bool wxIsSameDouble(double x, double y) inline bool wxIsSameDouble(double x, double y)