From d316c2b7fcb3ccfe24f008081b83f9040f71be0d Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sun, 19 Nov 2017 04:57:22 +0000 Subject: [PATCH] Fix min/max usage in variant git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@318622 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/variant | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/variant b/include/variant index 13450ddf2..4bb38b721 100644 --- a/include/variant +++ b/include/variant @@ -213,6 +213,9 @@ namespace std { #pragma GCC system_header #endif +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + namespace std { // explicitly not using versioning namespace class _LIBCPP_EXCEPTION_ABI bad_variant_access : public exception { @@ -1586,4 +1589,6 @@ struct _LIBCPP_TEMPLATE_VIS hash { _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP_VARIANT