From patchwork Sun Jun 16 21:58:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 251744 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 0D4F02C00A2 for ; Mon, 17 Jun 2013 07:58:18 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:content-type; q=dns; s=default; b=fE22Yb8iyIrF2IyBMLEdf 0seanKMkc16cAIT4OyLIGg535tQhOPFa2SQQgKaPpv0MbrTGWDOlhJMyYtNZao1z x0kseI68cZPZgxGv1Ri6D5JcYlCNZQuoDXKgb7W8KCj7vFXv39TpUmGlvUqeChOQ dnta/mvsAV4bpEtra3xQ7k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:content-type; s=default; bh=JpMDF1pyAvd0zMdg87a1SGDeU/s =; b=GoxsnBLPPYj954z89VU1K/mWNuvF40VMmlafQfoJBJTPrMzLbjzdihCVmh+ Wyd/fj03J2zv+mANlDfPUbsCUDgndFC30LngtkPK/IPQwrqAYVrXPtXqf5/4E1eE 5PoJ/fDJ5EU0PvQjPW+tMnGsKA+DDrLd/S+r2pocFMQC3pj4= Received: (qmail 26328 invoked by alias); 16 Jun 2013 21:58:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 26311 invoked by uid 89); 16 Jun 2013 21:58:11 -0000 X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, SPF_PASS autolearn=ham version=3.3.1 X-Spam-User: qpsmtpd, 2 recipients Received: from mail-la0-f47.google.com (HELO mail-la0-f47.google.com) (209.85.215.47) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Sun, 16 Jun 2013 21:58:10 +0000 Received: by mail-la0-f47.google.com with SMTP id fe20so1867602lab.34 for ; Sun, 16 Jun 2013 14:58:08 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.152.25.195 with SMTP id e3mr2776961lag.76.1371419887896; Sun, 16 Jun 2013 14:58:07 -0700 (PDT) Received: by 10.112.160.104 with HTTP; Sun, 16 Jun 2013 14:58:07 -0700 (PDT) In-Reply-To: References: Date: Sun, 16 Jun 2013 22:58:07 +0100 Message-ID: Subject: Re: [patch] N3659: add C++14's From: Jonathan Wakely To: "libstdc++" , gcc-patches X-Virus-Found: No Fix a stupid bug in shared_lock. Tested x86_64-linux, committed to trunk. * include/std/shared_mutex (shared_lock::operator=): Add missing return statement. commit b177aa326855e5e27ab53427d5a02012ffb944a4 Author: Jonathan Wakely Date: Sun Jun 16 21:27:55 2013 +0100 * include/std/shared_mutex (shared_lock::operator=): Add missing return statement. diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex index f606282..39ab83a 100644 --- a/libstdc++-v3/include/std/shared_mutex +++ b/libstdc++-v3/include/std/shared_mutex @@ -339,7 +339,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION shared_lock& operator=(shared_lock&& __sl) noexcept - { shared_lock(std::move(__sl)).swap(*this); } + { + shared_lock(std::move(__sl)).swap(*this); + return *this; + } void lock()