[gcc r12-10750] libstdc++: Use reserved form of [[__likely__]] in <variant>
Jonathan Wakely
redi@gcc.gnu.org
Mon Oct 7 08:56:18 GMT 2024
https://gcc.gnu.org/g:f6b9603a23e829212bbca95f9f9d592bd8a318cb
commit r12-10750-gf6b9603a23e829212bbca95f9f9d592bd8a318cb
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Jul 5 20:00:04 2024 +0100
libstdc++: Use reserved form of [[__likely__]] in <variant>
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)
Diff:
---
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<void>([](auto&& __this_mem) mutable
More information about the Gcc-cvs
mailing list