From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4A0E93857424; Tue, 12 Oct 2021 16:28:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A0E93857424 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 r10-10187] libstdc++: Remove non-deducible parameter for std::advance overload X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 154316697dbea9ba96bc14680b642b3ae35dadbd X-Git-Newrev: a2aa61a09b0267d42e436b0f9519094913474a9a Message-Id: <20211012162826.4A0E93857424@sourceware.org> Date: Tue, 12 Oct 2021 16:28:26 +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 16:28:26 -0000 https://gcc.gnu.org/g:a2aa61a09b0267d42e436b0f9519094913474a9a commit r10-10187-ga2aa61a09b0267d42e436b0f9519094913474a9a Author: Jonathan Wakely Date: Thu Sep 16 13:35:24 2021 +0100 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. (cherry picked from commit 21c760510d31253074577a14021fdc6ad44084b6) Diff: --- libstdc++-v3/include/bits/fs_path.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index 6e0a85417cc..7b49461794f 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -1348,7 +1348,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)); }