From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id C57C63857023 for ; Mon, 26 Oct 2020 21:19:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C57C63857023 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-EvOawt-yOv2By6f1ifugwQ-1; Mon, 26 Oct 2020 17:19:35 -0400 X-MC-Unique: EvOawt-yOv2By6f1ifugwQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56233108E1A0; Mon, 26 Oct 2020 21:19:34 +0000 (UTC) Received: from localhost (unknown [10.33.36.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02FEE5C1BB; Mon, 26 Oct 2020 21:19:33 +0000 (UTC) Date: Mon, 26 Oct 2020 21:19:33 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix error in experimental::strand Message-ID: <20201026211933.GA1911363@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="cNdxnHkX5QqsyA0e" Content-Disposition: inline X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2020 21:19:39 -0000 --cNdxnHkX5QqsyA0e Content-Type: text/plain; charset=us-ascii Content-Disposition: inline libstdc++-v3/ChangeLog: * include/experimental/executor (strand::_State): Fix thinko. Tested powerpc64le-linux. Committed to trunk. --cNdxnHkX5QqsyA0e Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit b784bbbe45414084551a824504650f21cb653ca1 Author: Jonathan Wakely Date: Mon Oct 26 21:00:06 2020 libstdc++: Fix error in experimental::strand libstdc++-v3/ChangeLog: * include/experimental/executor (strand::_State): Fix thinko. diff --git a/libstdc++-v3/include/experimental/executor b/libstdc++-v3/include/experimental/executor index 45e813f6747..462a4b24b16 100644 --- a/libstdc++-v3/include/experimental/executor +++ b/libstdc++-v3/include/experimental/executor @@ -1602,8 +1602,8 @@ inline namespace v1 { #if defined(_GLIBCXX_HAS_GTHREADS) bool - running_in_this_thread() const - { return std::this_thread::get_id() == _M_state->_M_running_on; } + running_in_this_thread() const noexcept + { return std::this_thread::get_id() == _M_running_on; } std::thread::id _M_running_on; #else --cNdxnHkX5QqsyA0e--