diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-11-19 04:57:22 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-11-19 04:57:22 +0000 |
| commit | afa6f8343748b4970502ef7da91455c93b17d941 (patch) | |
| tree | ddea440af834ed3021a6a12caeebc5b7703f1635 /libcxx | |
| parent | 0ed525382f733390e6400a058d5dead3c39449bb (diff) | |
| download | bcm5719-llvm-afa6f8343748b4970502ef7da91455c93b17d941.tar.gz bcm5719-llvm-afa6f8343748b4970502ef7da91455c93b17d941.zip | |
Fix min/max usage in variant
llvm-svn: 318622
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/variant | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libcxx/include/variant b/libcxx/include/variant index 13450ddf29b..4bb38b72129 100644 --- a/libcxx/include/variant +++ b/libcxx/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<monostate> { _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP_VARIANT |
