From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 3D9D63857C4E; Tue, 12 Oct 2021 10:58:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D9D63857C4E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9106] libstdc++: Add missing return for atomic timed wait [PR102074] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 9c2eea2841aa2ca165b9055763fffcee5008bf83 X-Git-Newrev: aeee9251c64fe59c3e548e843f08bbda302cb08b Message-Id: <20211012105857.3D9D63857C4E@sourceware.org> Date: Tue, 12 Oct 2021 10:58:57 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2021 10:58:57 -0000 https://gcc.gnu.org/g:aeee9251c64fe59c3e548e843f08bbda302cb08b commit r11-9106-gaeee9251c64fe59c3e548e843f08bbda302cb08b Author: Jonathan Wakely 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 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 __l(_M_mtx); return __cond_wait_until(_M_cv, _M_mtx, __atime); } + else + return true; #endif // _GLIBCXX_HAVE_PLATFORM_TIMED_WAIT } };