From 766ba681072a42838ae5c7ba1ae63448ba23c78f Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 13 Feb 2017 15:26:50 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294957 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/cmath | 2 +- include/math.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/cmath b/include/cmath index be3c3ee76..1b5225c04 100644 --- a/include/cmath +++ b/include/cmath @@ -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; diff --git a/include/math.h b/include/math.h index ef4e9678d..18dd3cc49 100644 --- a/include/math.h +++ b/include/math.h @@ -293,6 +293,9 @@ long double truncl(long double x); */ #include <__config> +#if defined(_LIBCPP_MSVCRT) +#include +#endif #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header