diff options
author | Petr Hosek <phosek@google.com> | 2021-06-07 12:35:02 -0700 |
---|---|---|
committer | Petr Hosek <phosek@google.com> | 2021-06-07 17:15:20 -0700 |
commit | 692d7166f7715514d0ff8090e5bd66668432b270 (patch) | |
tree | 162d4689b317cac09cb2be04f7d4166a76e15b6c /libcxx/include/__algorithm/includes.h | |
parent | d9633f229c36f292dab0e5f510ac635cfaf3a798 (diff) | |
download | llvm-692d7166f7715514d0ff8090e5bd66668432b270.zip llvm-692d7166f7715514d0ff8090e5bd66668432b270.tar.gz llvm-692d7166f7715514d0ff8090e5bd66668432b270.tar.bz2 |
Revert "[libcxx][gardening] Move all algorithms into their own headers."
This reverts commit 7ed7d4ccb8991e2b5b95334b508f8cec2faee737 as it
uncovered a Clang bug PR50592.
Diffstat (limited to 'libcxx/include/__algorithm/includes.h')
-rw-r--r-- | libcxx/include/__algorithm/includes.h | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/libcxx/include/__algorithm/includes.h b/libcxx/include/__algorithm/includes.h deleted file mode 100644 index affc2b7..0000000 --- a/libcxx/include/__algorithm/includes.h +++ /dev/null @@ -1,66 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___ALGORITHM_INCLUDES_H -#define _LIBCPP___ALGORITHM_INCLUDES_H - -#include <__config> -#include <__algorithm/comp_ref_type.h> -#include <__iterator/iterator_traits.h> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -#pragma GCC system_header -#endif - -_LIBCPP_PUSH_MACROS -#include <__undef_macros> - -_LIBCPP_BEGIN_NAMESPACE_STD - -template <class _Compare, class _InputIterator1, class _InputIterator2> -_LIBCPP_CONSTEXPR_AFTER_CXX17 bool -__includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, - _Compare __comp) -{ - for (; __first2 != __last2; ++__first1) - { - if (__first1 == __last1 || __comp(*__first2, *__first1)) - return false; - if (!__comp(*__first1, *__first2)) - ++__first2; - } - return true; -} - -template <class _InputIterator1, class _InputIterator2, class _Compare> -_LIBCPP_NODISCARD_EXT inline -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 -bool -includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2, - _Compare __comp) -{ - typedef typename __comp_ref_type<_Compare>::type _Comp_ref; - return _VSTD::__includes<_Comp_ref>(__first1, __last1, __first2, __last2, __comp); -} - -template <class _InputIterator1, class _InputIterator2> -_LIBCPP_NODISCARD_EXT inline -_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17 -bool -includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2) -{ - return _VSTD::includes(__first1, __last1, __first2, __last2, - __less<typename iterator_traits<_InputIterator1>::value_type, - typename iterator_traits<_InputIterator2>::value_type>()); -} - -_LIBCPP_END_NAMESPACE_STD - -_LIBCPP_POP_MACROS - -#endif // _LIBCPP___ALGORITHM_INCLUDES_H |