Author: ericwf Date: Sat Nov 18 20:57:22 2017 New Revision: 318622 URL: http://llvm.org/viewvc/llvm-project?rev=318622&view=rev Log: Fix min/max usage in variant
Modified: libcxx/trunk/include/variant Modified: libcxx/trunk/include/variant URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/variant?rev=318622&r1=318621&r2=318622&view=diff ============================================================================== --- libcxx/trunk/include/variant (original) +++ libcxx/trunk/include/variant Sat Nov 18 20:57:22 2017 @@ -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<monosta _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP_VARIANT _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits