maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

math: correct the MSVCRT condition 

Fixes a number of tests in the testsuite on Windows.

llvm-svn: 295330
This commit is contained in:
Saleem Abdulrasool 2017-02-16 15:47:50 +00:00
parent 305b4f2ba9
commit 3d99648f00
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/include/cmath
View File

@ -398,7 +398,7 @@ using ::cbrtf;
using ::copysign;
using ::copysignf;
#if !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_NAJOR_VERSION-0) >= 14)
#if !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))
using ::erf;
using ::erff;
using ::erfc;
@ -435,7 +435,7 @@ using ::lrint;
using ::lrintf;
using ::lround;
using ::lroundf;
#endif // _LIBCPP_MSVCRT
#endif // !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))
using ::nan;
using ::nanf;

4
libcxx/include/math.h
View File

@ -1020,7 +1020,7 @@ copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
return ::copysign((__result_type)__lcpp_x, (__result_type)__lcpp_y);
}
#if !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_MAJOR_VERSION-0) >= 14)
#if !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))
// erf
@ -1404,7 +1404,7 @@ inline _LIBCPP_INLINE_VISIBILITY
typename std::enable_if<std::is_integral<_A1>::value, double>::type
trunc(_A1 __lcpp_x) _NOEXCEPT {return ::trunc((double)__lcpp_x);}
#endif // !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_MAJOR_VERSION-0) >= 14)
#endif // !(defined(_LIBCPP_MSVCRT) && ((_VC_CRT_NAJOR_VERSION-0) < 14))
} // extern "C++"