From b9d9368bac6cf937f457507e98e875e56b1dd077 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 7 Feb 2024 15:58:02 +0100 Subject: Merge llvm-project release/18.x llvmorg-18.1.0-rc2-0-gc6c86965d967 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/18.x llvmorg-18.1.0-rc2-0-gc6c86965d967. PR: 276104 MFC after: 1 month (cherry picked from commit b3edf4467982447620505a28fc82e38a414c07dc) --- contrib/llvm-project/libcxx/include/__algorithm/equal.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib/llvm-project/libcxx/include/__algorithm/equal.h') diff --git a/contrib/llvm-project/libcxx/include/__algorithm/equal.h b/contrib/llvm-project/libcxx/include/__algorithm/equal.h index f03f010aa51a..3c0e3060e39a 100644 --- a/contrib/llvm-project/libcxx/include/__algorithm/equal.h +++ b/contrib/llvm-project/libcxx/include/__algorithm/equal.h @@ -30,6 +30,9 @@ # pragma GCC system_header #endif +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + _LIBCPP_BEGIN_NAMESPACE_STD template @@ -162,4 +165,6 @@ equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP___ALGORITHM_EQUAL_H -- cgit v1.2.3