diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2022-02-05 20:07:43 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-06-04 11:59:26 +0000 |
| commit | 67eec5325a1ab99d493fd7e0381d20aab19b286e (patch) | |
| tree | b14fe1fa6cc55067c1deecc4adc75920d3630d12 /contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h | |
| parent | 390adc38fc112be360bd15499e5241bf4e675b6f (diff) | |
| download | src-67eec5325a1ab99d493fd7e0381d20aab19b286e.tar.gz src-67eec5325a1ab99d493fd7e0381d20aab19b286e.zip | |
Merge llvm-project main llvmorg-14-init-18294-gdb01b123d012
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-18294-gdb01b123d012, the last commit before
the upstream release/14.x branch was created.
PR: 261742
MFC after: 2 weeks
(cherry picked from commit 1fd87a682ad7442327078e1eeb63edc4258f9815)
Diffstat (limited to 'contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h')
| -rw-r--r-- | contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h b/contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h index 20b1d42b26c8..5f5b3f505773 100644 --- a/contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h +++ b/contrib/llvm-project/libcxx/include/__ranges/enable_borrowed_range.h @@ -22,7 +22,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_RANGES) +#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS) namespace ranges { @@ -34,7 +34,7 @@ inline constexpr bool enable_borrowed_range = false; } // namespace ranges -#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_RANGES) +#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS) _LIBCPP_END_NAMESPACE_STD |