From a5b2dbc259e289ea23fe9aebb34eba2c1dc7fefb Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 29 Jan 2014 19:30:27 +0000 Subject: Vendor import of libc++ tags/RELEASE_34/final r197960: https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_34/final@197960 --- include/__undef_min_max | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/__undef_min_max') diff --git a/include/__undef_min_max b/include/__undef_min_max index b1e80d1b0499..5df9412c64fd 100644 --- a/include/__undef_min_max +++ b/include/__undef_min_max @@ -9,11 +9,21 @@ //===----------------------------------------------------------------------===// #ifdef min +#if defined(_MSC_VER) && ! defined(__clang__) +_LIBCPP_WARNING("macro min is incompatible with C++. Try #define NOMINMAX " + "before any Windows header. #undefing min") +#else #warning: macro min is incompatible with C++. #undefing min +#endif #undef min #endif #ifdef max +#if defined(_MSC_VER) && ! defined(__clang__) +_LIBCPP_WARNING("macro max is incompatible with C++. Try #define NOMINMAX " + "before any Windows header. #undefing max") +#else #warning: macro max is incompatible with C++. #undefing max +#endif #undef max #endif -- cgit v1.3