diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-28 20:18:39 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2015-02-28 20:18:39 +0000 |
| commit | 66d4c6e78cef2aad52b7a0344a5afc073c638ca9 (patch) | |
| tree | 2f8cce3c3e82415f13020f5b4cad2285a0206cad /libcxx/include | |
| parent | 4b7dd64d829b5745590c0cb1bafe92ea66eec661 (diff) | |
| download | bcm5719-llvm-66d4c6e78cef2aad52b7a0344a5afc073c638ca9.tar.gz bcm5719-llvm-66d4c6e78cef2aad52b7a0344a5afc073c638ca9.zip | |
cmath: account for MSVCRT 12.0 changes
MSVCRT 12.0 introduces better compatibility for C99. This includes a number of
math routines that were previously undefined. Use the crtversion.h header to
detect the version of MSVCRT being targeted and avoid re-declaring the
variables.
Since copysign has been introduced in MSVCRT, importing the definition via using
makes it difficult to provide overloads (due to minor differences between
throw () and noexcept. Avoid defining the overloads on newer MSVCRT
targets.
llvm-svn: 230867
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/cmath | 12 | ||||
| -rw-r--r-- | libcxx/include/support/win32/math_win32.h | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libcxx/include/cmath b/libcxx/include/cmath index c2c6301bf07..b340b4d50f0 100644 --- a/libcxx/include/cmath +++ b/libcxx/include/cmath @@ -1109,8 +1109,16 @@ cbrt(_A1 __lcpp_x) _NOEXCEPT {return cbrt((double)__lcpp_x);} using ::copysign; using ::copysignf; -inline _LIBCPP_INLINE_VISIBILITY float copysign(float __lcpp_x, float __lcpp_y) _NOEXCEPT {return copysignf(__lcpp_x, __lcpp_y);} -inline _LIBCPP_INLINE_VISIBILITY long double copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return copysignl(__lcpp_x, __lcpp_y);} +#if !defined(_VC_CRT_MAJOR_VERSION) || (_VC_CRT_MAJOR_VERSION < 12) +inline _LIBCPP_INLINE_VISIBILITY float copysign(float __lcpp_x, + float __lcpp_y) _NOEXCEPT { + return copysignf(__lcpp_x, __lcpp_y); +} +inline _LIBCPP_INLINE_VISIBILITY long double +copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT { + return copysignl(__lcpp_x, __lcpp_y); +} +#endif template <class _A1, class _A2> inline _LIBCPP_INLINE_VISIBILITY diff --git a/libcxx/include/support/win32/math_win32.h b/libcxx/include/support/win32/math_win32.h index c62c54e3cd8..0d6b422a165 100644 --- a/libcxx/include/support/win32/math_win32.h +++ b/libcxx/include/support/win32/math_win32.h @@ -17,7 +17,9 @@ #include <math.h> #include <float.h> // _FPCLASS_PN etc. +#include <crtversion.h> +#if ((_VC_CRT_MAJOR_VERSION-0) < 12) // Necessary? typedef float float_t; typedef double double_t; @@ -109,7 +111,7 @@ _LIBCPP_ALWAYS_INLINE int fpclassify( double num ) { return _fpclass(num); } - +#endif #endif // _LIBCPP_MSVCRT #endif // _LIBCPP_SUPPORT_WIN32_MATH_WIN32_H |
