diff options
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__bit_reference | 2 | ||||
| -rw-r--r-- | libcxx/include/__hash_table | 2 | ||||
| -rw-r--r-- | libcxx/include/__split_buffer | 2 | ||||
| -rw-r--r-- | libcxx/include/__std_stream | 2 | ||||
| -rw-r--r-- | libcxx/include/__undef_min_max | 19 | ||||
| -rw-r--r-- | libcxx/include/algorithm | 2 | ||||
| -rw-r--r-- | libcxx/include/bitset | 2 | ||||
| -rw-r--r-- | libcxx/include/chrono | 2 | ||||
| -rw-r--r-- | libcxx/include/deque | 2 | ||||
| -rw-r--r-- | libcxx/include/forward_list | 2 | ||||
| -rw-r--r-- | libcxx/include/fstream | 2 | ||||
| -rw-r--r-- | libcxx/include/istream | 2 | ||||
| -rw-r--r-- | libcxx/include/limits | 2 | ||||
| -rw-r--r-- | libcxx/include/list | 2 | ||||
| -rw-r--r-- | libcxx/include/locale | 2 | ||||
| -rw-r--r-- | libcxx/include/memory | 2 | ||||
| -rw-r--r-- | libcxx/include/mutex | 2 | ||||
| -rw-r--r-- | libcxx/include/random | 2 | ||||
| -rw-r--r-- | libcxx/include/ratio | 2 | ||||
| -rw-r--r-- | libcxx/include/regex | 2 | ||||
| -rw-r--r-- | libcxx/include/sstream | 2 | ||||
| -rw-r--r-- | libcxx/include/string | 2 | ||||
| -rw-r--r-- | libcxx/include/valarray | 2 | ||||
| -rw-r--r-- | libcxx/include/vector | 2 |
24 files changed, 65 insertions, 0 deletions
diff --git a/libcxx/include/__bit_reference b/libcxx/include/__bit_reference index 46213332c3e..9ee1dd94314 100644 --- a/libcxx/include/__bit_reference +++ b/libcxx/include/__bit_reference @@ -14,6 +14,8 @@ #include <__config> #include <algorithm> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table index 4399caad658..39de62acd03 100644 --- a/libcxx/include/__hash_table +++ b/libcxx/include/__hash_table @@ -18,6 +18,8 @@ #include <algorithm> #include <cmath> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer index 33ce42da31a..581f1596cca 100644 --- a/libcxx/include/__split_buffer +++ b/libcxx/include/__split_buffer @@ -6,6 +6,8 @@ #include <type_traits> #include <algorithm> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/__std_stream b/libcxx/include/__std_stream index 6df6556da76..7fe34d49d98 100644 --- a/libcxx/include/__std_stream +++ b/libcxx/include/__std_stream @@ -17,6 +17,8 @@ #include <__locale> #include <cstdio> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/__undef_min_max b/libcxx/include/__undef_min_max new file mode 100644 index 00000000000..88bc53feaaf --- /dev/null +++ b/libcxx/include/__undef_min_max @@ -0,0 +1,19 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifdef min +#warning: macro min is incompatible with C++. #undef'ing min +#undef min +#endif + +#ifdef max +#warning: macro max is incompatible with C++. #undef'ing max +#undef max +#endif diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 6749bf61178..6255c52f30d 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -595,6 +595,8 @@ template <class BidirectionalIterator, class Compare> #include <iterator> #include <cstdlib> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/bitset b/libcxx/include/bitset index c970f329071..4735754c6f9 100644 --- a/libcxx/include/bitset +++ b/libcxx/include/bitset @@ -129,6 +129,8 @@ template <size_t N> struct hash<std::bitset<N>>; #include <cassert> #endif +#include <__undef_min_max> + _LIBCPP_BEGIN_NAMESPACE_STD template <size_t _N_words, size_t _Size> diff --git a/libcxx/include/chrono b/libcxx/include/chrono index 1c79f4bbe80..0571f9dff7e 100644 --- a/libcxx/include/chrono +++ b/libcxx/include/chrono @@ -255,6 +255,8 @@ typedef steady_clock high_resolution_clock; #include <ratio> #include <limits> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/deque b/libcxx/include/deque index ab9ba58b028..f304f569086 100644 --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -162,6 +162,8 @@ template <class T, class Allocator> #include <algorithm> #include <stdexcept> +#include <__undef_min_max> + _LIBCPP_BEGIN_NAMESPACE_STD template <class _Tp, class _Allocator> class __deque_base; diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list index 61fe290d9e2..ffd44a595d0 100644 --- a/libcxx/include/forward_list +++ b/libcxx/include/forward_list @@ -174,6 +174,8 @@ template <class T, class Allocator> #include <iterator> #include <algorithm> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/fstream b/libcxx/include/fstream index b6a2ab0e158..4456c017973 100644 --- a/libcxx/include/fstream +++ b/libcxx/include/fstream @@ -171,6 +171,8 @@ typedef basic_fstream<wchar_t> wfstream; #include <__locale> #include <cstdio> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/istream b/libcxx/include/istream index 24d9f3a9f63..f271393136f 100644 --- a/libcxx/include/istream +++ b/libcxx/include/istream @@ -155,6 +155,8 @@ template <class charT, class traits, class T> #include <__config> #include <ostream> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/limits b/libcxx/include/limits index 14b49b1385b..ea579ad3136 100644 --- a/libcxx/include/limits +++ b/libcxx/include/limits @@ -109,6 +109,8 @@ template<> class numeric_limits<cv long double>; #include <__config> #include <type_traits> +#include <__undef_min_max> + #if defined(_MSC_VER) #include "support/win32/limits_win32.h" #endif // _MSC_VER diff --git a/libcxx/include/list b/libcxx/include/list index 345f24dbbe4..add519f260e 100644 --- a/libcxx/include/list +++ b/libcxx/include/list @@ -176,6 +176,8 @@ template <class T, class Alloc> #include <iterator> #include <algorithm> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/locale b/libcxx/include/locale index b2afbd40e07..5dc3ff24096 100644 --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -192,6 +192,8 @@ template <class charT> class messages_byname; #include <nl_types.h> #endif // !_WIN32 +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/memory b/libcxx/include/memory index 878dda8730d..7576aaebc46 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -600,6 +600,8 @@ void* align(size_t alignment, size_t size, void*& ptr, size_t& space); #include <cassert> #endif +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/mutex b/libcxx/include/mutex index 37e74d6d575..d1d0a6e0587 100644 --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -179,6 +179,8 @@ template<class Callable, class ...Args> #include <tuple> #endif +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/random b/libcxx/include/random index c5c33c0fb32..e14425dff98 100644 --- a/libcxx/include/random +++ b/libcxx/include/random @@ -1646,6 +1646,8 @@ class piecewise_linear_distribution #include <ostream> #include <cmath> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/ratio b/libcxx/include/ratio index 654cb3312e9..eb1ad24e40e 100644 --- a/libcxx/include/ratio +++ b/libcxx/include/ratio @@ -70,6 +70,8 @@ typedef ratio<1000000000000000000000000, 1> yotta; // not supported #include <climits> #include <type_traits> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif 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 diff --git a/libcxx/include/sstream b/libcxx/include/sstream index 1b27195f901..22450f0adb2 100644 --- a/libcxx/include/sstream +++ b/libcxx/include/sstream @@ -175,6 +175,8 @@ typedef basic_stringstream<wchar_t> wstringstream; #include <istream> #include <string> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/string b/libcxx/include/string index 5f5a347c634..344bb5514b6 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -446,6 +446,8 @@ template <> struct hash<wstring>; #include <cassert> #endif +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/valarray b/libcxx/include/valarray index 5d3154cc9f8..3ac9494120f 100644 --- a/libcxx/include/valarray +++ b/libcxx/include/valarray @@ -346,6 +346,8 @@ template <class T> unspecified2 end(const valarray<T>& v); #include <algorithm> #include <functional> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif diff --git a/libcxx/include/vector b/libcxx/include/vector index 7f7e3d361b9..10702f3c870 100644 --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -270,6 +270,8 @@ void swap(vector<T,Allocator>& x, vector<T,Allocator>& y) #include <__split_buffer> #include <__functional_base> +#include <__undef_min_max> + #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif |
