From patchwork Thu Sep 16 22:08:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 45100 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D2F6D385AC1B for ; Thu, 16 Sep 2021 22:14:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2F6D385AC1B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1631830498; bh=5RV/npSRv6Oumysr1AI5AztTj71XxE1q6KfG6Y/dpGo=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ZXaaZP0ED528EjVO6iCsE5mhyKOqgfOxktL9uuVOm6UtO2dQhsWip7JVKRnsrggWD eFWDIycx2dMG5UvX1ewLU148fJdhAWDZ6U0xE0ngzigNJJ3qM+BDnq6hV27g0qds2t xPXsn+ouaytgyc3tibJxkiM61TXRqg1/tTWL8/mA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 9A3123857433 for ; Thu, 16 Sep 2021 22:08:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9A3123857433 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-209-73JgboPiNrezX3yCWnYefQ-1; Thu, 16 Sep 2021 18:08:08 -0400 X-MC-Unique: 73JgboPiNrezX3yCWnYefQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8143E1006AAE; Thu, 16 Sep 2021 22:08:06 +0000 (UTC) Received: from localhost (unknown [10.33.36.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30FDF60583; Thu, 16 Sep 2021 22:08:06 +0000 (UTC) Date: Thu, 16 Sep 2021 23:08:05 +0100 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove non-deducible parameter for std::advance overload Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-14.0 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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This was just a copy and paste error. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/fs_path.h (advance): Remove non-deducible template parameter. Tested x86_64-linux. Committed to trunk. commit 21c760510d31253074577a14021fdc6ad44084b6 Author: Jonathan Wakely Date: Thu Sep 16 13:35:24 2021 libstdc++: Remove non-deducible parameter for std::advance overload This was just a copy and paste error. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/fs_path.h (advance): Remove non-deducible template parameter. diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index 3151af1e901..235d1df748f 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -1357,7 +1357,7 @@ inline ptrdiff_t distance(filesystem::path::iterator __first, filesystem::path::iterator __last) { return __path_iter_distance(__first, __last); } -template +template void advance(filesystem::path::iterator& __i, _Distance __n) { __path_iter_advance(__i, static_cast(__n)); }