summaryrefslogtreecommitdiffstats
path: root/libcxx/include/regex
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-11-29 16:45:27 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-11-29 16:45:27 +0000
commitab4f438239424dd39b83338ab0b4faa41245e506 (patch)
treea8b954bc4709873c1a36b50184a051f5e6330e9e /libcxx/include/regex
parent7a81dea5168d9ff98c1c99e6a4c971823400a291 (diff)
downloadbcm5719-llvm-ab4f438239424dd39b83338ab0b4faa41245e506.tar.gz
bcm5719-llvm-ab4f438239424dd39b83338ab0b4faa41245e506.zip
Add protection from min/max macros
llvm-svn: 145407
Diffstat (limited to 'libcxx/include/regex')
-rw-r--r--libcxx/include/regex2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex
index 048fbefc9e9..1da7b0e76f7 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -732,6 +732,8 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
#include <vector>
#include <deque>
+#include <__undef_min_max>
+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
OpenPOWER on IntegriCloud