diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-08-13 01:56:02 +0400 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-08-13 01:56:02 +0400 |
| commit | 54976f2619ab9ccd321acf46dde4c15baeb84694 (patch) | |
| tree | 43d2d54cc7b628da57bae18fb1031d29fb32896f /libcxx/include/algorithm | |
| parent | c53dd2ac01eb3044da996ad5b8d30ef85a18cda5 (diff) | |
Fixed PR10574: http://llvm.org/bugs/show_bug.cgi?id=10574
llvm-svn: 137522
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 3e0938fe2ea8..da9d0fe3c3b0 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -2233,6 +2233,8 @@ min(const _Tp& __a, const _Tp& __b) return _VSTD::min(__a, __b, __less<_Tp>()); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + template<class _Tp, class _Compare> inline _LIBCPP_INLINE_VISIBILITY _Tp @@ -2249,6 +2251,8 @@ min(initializer_list<_Tp> __t) return *_VSTD::min_element(__t.begin(), __t.end()); } +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + // max_element template <class _ForwardIterator, class _Compare> @@ -2293,6 +2297,8 @@ max(const _Tp& __a, const _Tp& __b) return _VSTD::max(__a, __b, __less<_Tp>()); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + template<class _Tp, class _Compare> inline _LIBCPP_INLINE_VISIBILITY _Tp @@ -2309,6 +2315,8 @@ max(initializer_list<_Tp> __t) return *_VSTD::max_element(__t.begin(), __t.end()); } +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + // minmax_element template <class _ForwardIterator, class _Compare> @@ -2388,6 +2396,8 @@ minmax(const _Tp& __a, const _Tp& __b) return _VSTD::minmax(__a, __b, __less<_Tp>()); } +#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + template<class _Tp> inline _LIBCPP_INLINE_VISIBILITY pair<_Tp, _Tp> @@ -2408,6 +2418,8 @@ minmax(initializer_list<_Tp> __t, _Compare __comp) return pair<_Tp, _Tp>(*__p.first, *__p.second); } +#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS + // random_shuffle // __independent_bits_engine |