From f6b9603a23e829212bbca95f9f9d592bd8a318cb Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 5 Jul 2024 20:00:04 +0100 Subject: [PATCH] libstdc++: Use reserved form of [[__likely__]] in We should not use [[unlikely]] before C++20, so use [[__unlikely__]] instead. libstdc++-v3/ChangeLog: * include/std/variant (_Variant_storage::_M_reset): Use __unlikely__ form of attribute instead of unlikely. (cherry picked from commit 9f1cd51766f251aafe0f1b898892f79855892729) --- libstdc++-v3/include/std/variant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 9abe7b9ed6d7..75214c687dfd 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -491,7 +491,7 @@ namespace __variant constexpr void _M_reset() { - if (!_M_valid()) [[unlikely]] + if (!_M_valid()) [[__unlikely__]] return; std::__do_visit([](auto&& __this_mem) mutable -- 2.47.2