summaryrefslogtreecommitdiffstats
path: root/contrib/libc++/include/__string
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libc++/include/__string')
-rw-r--r--contrib/libc++/include/__string8
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/libc++/include/__string b/contrib/libc++/include/__string
index 75608ce..d30c7fd 100644
--- a/contrib/libc++/include/__string
+++ b/contrib/libc++/include/__string
@@ -57,14 +57,16 @@ template <> struct char_traits<wchar_t>;
#include <cstdio> // For EOF.
#include <memory> // for __murmur2_or_cityhash
-#include <__undef_min_max>
-
#include <__debug>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
+
_LIBCPP_BEGIN_NAMESPACE_STD
// char_traits
@@ -870,4 +872,6 @@ struct __quoted_output_proxy
_LIBCPP_END_NAMESPACE_STD
+_LIBCPP_POP_MACROS
+
#endif // _LIBCPP___STRING
OpenPOWER on IntegriCloud