public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-9106] libstdc++: Add missing return for atomic timed wait [PR102074]
Date: Tue, 12 Oct 2021 10:58:57 +0000 (GMT)	[thread overview]
Message-ID: <20211012105857.3D9D63857C4E@sourceware.org> (raw)

https://gcc.gnu.org/g:aeee9251c64fe59c3e548e843f08bbda302cb08b

commit r11-9106-gaeee9251c64fe59c3e548e843f08bbda302cb08b
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 31 16:50:17 2021 +0100

    libstdc++: Add missing return for atomic timed wait [PR102074]
    
    This adds a missing return statement to the non-futex wait-until
    operation.
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/102074
            * include/bits/atomic_timed_wait.h (__timed_waiter_pool)
            [!_GLIBCXX_HAVE_PLATFORM_TIMED_WAIT]: Add missing return.
    
    (cherry picked from commit 763eb1f19239ebb19c0f87590a4f02300c02c52b)

Diff:
---
 libstdc++-v3/include/bits/atomic_timed_wait.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libstdc++-v3/include/bits/atomic_timed_wait.h b/libstdc++-v3/include/bits/atomic_timed_wait.h
index ec7ff51cdbc..3db08f82707 100644
--- a/libstdc++-v3/include/bits/atomic_timed_wait.h
+++ b/libstdc++-v3/include/bits/atomic_timed_wait.h
@@ -213,6 +213,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	      lock_guard<mutex> __l(_M_mtx);
 	      return __cond_wait_until(_M_cv, _M_mtx, __atime);
 	    }
+	  else
+	    return true;
 #endif // _GLIBCXX_HAVE_PLATFORM_TIMED_WAIT
 	}
     };


                 reply	other threads:[~2021-10-12 10:58 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211012105857.3D9D63857C4E@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).