From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id CDAAB39494B3; Wed, 17 Jun 2020 18:39:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CDAAB39494B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592419180; bh=2YY6DIQp6GLwiE2ovAluErU+rzU4HU4Dz1FYXX202PY=; h=From:To:Subject:Date:From; b=i7OPOK8FsrTHocHzsw93acVDu47j1kYmj9jaqK1tY66jojrMrSGaUUDd/xP8Gtsi/ r2PSQrQPYxClQeRUO2hdrZaQ56+lokUUmYaLTL7vHoEVFAEyd6K7wt73OeOdGsUQyx /2fpPkRwuGEzv0Xo4p22eJQFUrdDLHCjqEEN0+tw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Fix comment to refer to correct PR X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: 26eae9ac2bf75a26a419dc1e47a067c66331fb74 X-Git-Newrev: bd630df033784c791c3ca49fc30821eaee35f7c2 Message-Id: <20200617183940.CDAAB39494B3@sourceware.org> Date: Wed, 17 Jun 2020 18:39:40 +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: Wed, 17 Jun 2020 18:39:40 -0000 https://gcc.gnu.org/g:bd630df033784c791c3ca49fc30821eaee35f7c2 commit bd630df033784c791c3ca49fc30821eaee35f7c2 Author: Jonathan Wakely Date: Thu Feb 6 11:33:12 2020 +0000 libstdc++: Fix comment to refer to correct PR * include/bits/stl_iterator.h (__detail::__common_iter_ptr): Fix PR number in comment. Fix indentation. Diff: --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/bits/stl_iterator.h | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a9c96ac9185..5ce1473b621 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2020-02-06 Jonathan Wakely + * include/bits/stl_iterator.h (__detail::__common_iter_ptr): Fix PR + number in comment. Fix indentation. + * include/bits/stl_algobase.h (__iter_swap, __iter_swap): Remove redundant _GLIBCXX20_CONSTEXPR. diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index c200f7a9d14..69c6ae66cdf 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1737,12 +1737,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { - // FIXME: This has to be at namespace-scope because of PR 92078. + // FIXME: This has to be at namespace-scope because of PR 92103. template struct __common_iter_ptr - { - using type = void; - }; + { + using type = void; + }; template requires __detail::__common_iter_has_arrow<_Iter>