[libcxx] r294957 - math: actually pull the declarations/overloads into std

Saleem Abdulrasool via cfe-commits cfe-commits at lists.llvm.org
Mon Feb 13 07:26:50 PST 2017


Author: compnerd
Date: Mon Feb 13 09:26:50 2017
New Revision: 294957

URL: http://llvm.org/viewvc/llvm-project?rev=294957&view=rev
Log:
math: actually pull the declarations/overloads into std

The previous changes missed the change to include/cmath.  These changes
allow some of the rand.distribution tests to pass on Windows.

Modified:
    libcxx/trunk/include/cmath
    libcxx/trunk/include/math.h

Modified: libcxx/trunk/include/cmath
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cmath?rev=294957&r1=294956&r2=294957&view=diff
==============================================================================
--- libcxx/trunk/include/cmath (original)
+++ libcxx/trunk/include/cmath Mon Feb 13 09:26:50 2017
@@ -398,7 +398,7 @@ using ::cbrtf;
 using ::copysign;
 using ::copysignf;
 
-#ifndef _LIBCPP_MSVCRT
+#if !defined(_LIBCPP_MSVCRT) || ((_VC_CRT_NAJOR_VERSION-0) >= 14)
 using ::erf;
 using ::erff;
 using ::erfc;

Modified: libcxx/trunk/include/math.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/math.h?rev=294957&r1=294956&r2=294957&view=diff
==============================================================================
--- libcxx/trunk/include/math.h (original)
+++ libcxx/trunk/include/math.h Mon Feb 13 09:26:50 2017
@@ -293,6 +293,9 @@ long double    truncl(long double x);
 */
 
 #include <__config>
+#if defined(_LIBCPP_MSVCRT)
+#include <crtversion.h>
+#endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header




More information about the cfe-commits mailing list