[gcc r15-1876] libstdc++: Use reserved form of [[__likely__]] in <variant>

Jonathan Wakely redi@gcc.gnu.org
Sat Jul 6 20:17:50 GMT 2024


https://gcc.gnu.org/g:9f1cd51766f251aafe0f1b898892f79855892729

commit r15-1876-g9f1cd51766f251aafe0f1b898892f79855892729
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.

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 13ea1dd3849..3a23d9bc66d 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -492,7 +492,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 Libstdc++-cvs mailing list