diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-01 20:59:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-01 20:59:10 +0000 |
| commit | edb11085302f80f38c9d976f003aa1c9002c7abb (patch) | |
| tree | edfe9dcac670e9f47ee7fdee893130fcf86ba196 /include/vector | |
| parent | 10a0bef720b6882fce588a10b07b0584d62eac76 (diff) | |
| download | src-edb11085302f80f38c9d976f003aa1c9002c7abb.tar.gz src-edb11085302f80f38c9d976f003aa1c9002c7abb.zip | |
Vendor import of libc++ trunk r304460:vendor/libc++/libc++-trunk-r304460
Notes
Notes:
svn path=/vendor/libc++/dist/; revision=319467
svn path=/vendor/libc++/libc++-trunk-r304460/; revision=319468; tag=vendor/libc++/libc++-trunk-r304460
Diffstat (limited to 'include/vector')
| -rw-r--r-- | include/vector | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/vector b/include/vector index 6759dbd8a584..ee19fb7081a2 100644 --- a/include/vector +++ b/include/vector @@ -275,14 +275,16 @@ void swap(vector<T,Allocator>& x, vector<T,Allocator>& y) #include <__split_buffer> #include <__functional_base> -#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 template <bool> @@ -3357,4 +3359,6 @@ swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y) _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP_VECTOR |