From patchwork Wed Dec 31 06:58:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Shen X-Patchwork-Id: 424736 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5781E1400A0 for ; Wed, 31 Dec 2014 17:58:50 +1100 (AEDT) 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:date:message-id:subject:from:to:content-type; q= dns; s=default; b=MCD8ibI0SQLOo0DXXJnoqabSAoe8/ZWRk0EcR4sUmhgQRc HqTQg7gCeWT3izusl0j8wyyMkXN3Y+6ZwBbV0oNRjz/zxn+KKubLT2LghkU47zEF Xl/QGotI6AORYX2WrdffM4crJJlpLjcxaVqE0N/Zn9xclydwerJuJsNNjBRAc= 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:date:message-id:subject:from:to:content-type; s= default; bh=QkqRMVmBwZI2ZSQSH+C1047d6XQ=; b=IBNxs2CpR/N62sOjz3Pk geL6aC1OiRNm7L6ufVb78Sf0gPGASw3gOgkiiDlXgVmSiakoFcIDlXTzatpC2ubQ zosf1x544FqRkPpag4LUKGlgDKq8nO7QVAi/uNv/kfoP3BP0SFmvQXj4Ryz/+kCM I2OOve5/KBO5ZiemCbF3AKY= Received: (qmail 22551 invoked by alias); 31 Dec 2014 06:58:33 -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 22527 invoked by uid 89); 31 Dec 2014 06:58:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-qg0-f42.google.com Received: from mail-qg0-f42.google.com (HELO mail-qg0-f42.google.com) (209.85.192.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 31 Dec 2014 06:58:29 +0000 Received: by mail-qg0-f42.google.com with SMTP id q108so11393239qgd.1 for ; Tue, 30 Dec 2014 22:58:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=xEpPjFgiUC0VAgeZr2iPIBfVW5B+tjH5lf02dlTJhig=; b=iJKYqZR0qis/vMLaPKKEQMBkqHjYDUE6zlTGtrkPXYibP3l11B2m++FMd525wBI/qk 7z5i/MsELBnuVs0pUFT6+tQYJfxC0qgN9siB6m3WBS7kvc3UJbeijzK8bM1mUELlzQhR 208D6I3JqdTRzllGo4aUh0mNF35ckYqxlxTo8wmYy1Qb7DGUf/yQE9VH3li/VuMmY+Ww sZ5QYrZyJ+DA4wJDXAGucj6O7ZXr3KKxf4RhTZ4rOrGq27ORfTvzltV7RrEgced7gTOS 5JI+VioEUKOa49aWngo/JG+UpPR9mxWGMkpAwAtwaSHBrpHG2CEHVB6D3mruRHHqz8Fc JJZA== X-Gm-Message-State: ALoCoQmqA7r9eYJOWluKXYn7g/F46xwxBnYhDFW6OUV5L2AFJUqB2pqLWjEcEaEk97QkGoA3ygRQ MIME-Version: 1.0 X-Received: by 10.224.128.196 with SMTP id l4mr97712077qas.100.1420009107637; Tue, 30 Dec 2014 22:58:27 -0800 (PST) Received: by 10.96.254.231 with HTTP; Tue, 30 Dec 2014 22:58:27 -0800 (PST) Date: Tue, 30 Dec 2014 22:58:27 -0800 Message-ID: Subject: [Patch, libstdc++/64441] Fix sub_match::first and second From: Tim Shen To: "libstdc++" , gcc-patches A dumb mistake :) Bootstrapped and tested. Thanks! diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc index 0206a6c..b541446 100644 --- a/libstdc++-v3/include/bits/regex.tcc +++ b/libstdc++-v3/include/bits/regex.tcc @@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } if (__ret) { - for (auto __it : __res) + for (auto& __it : __res) if (!__it.matched) __it.first = __it.second = __e; auto& __pre = __res[__res.size()-2]; diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc index a973667..7954d06 100644 --- a/libstdc++-v3/include/bits/regex_executor.tcc +++ b/libstdc++-v3/include/bits/regex_executor.tcc @@ -310,7 +310,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (!__submatch.matched) break; auto __last = _M_current; - for (auto __tmp = __submatch.first; + for (auto& __tmp = __submatch.first; __last != _M_end && __tmp != __submatch.second; ++__tmp) ++__last;