From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1984) id A5360393FC2F; Fri, 17 Jul 2020 12:39:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5360393FC2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1594989544; bh=/i2yEbWRnnakmalkAdatT/eemzTVd3Erz0gcie1hJQg=; h=From:To:Subject:Date:From; b=GOCv/tVBkv1kEIf8qepGJT05LZetope9IZXBDM2tyF7+S+ZjlSKEU2LIwYr++82KZ bo85KJpdqec5vz3g8EJ2xGS2Bccd2fm7H8UQSDimtCqanYNOw2/rNfRW5OMdhFyXPS iMVhtMKD89wGrV/IVXgpRTgLNkoNoNBEWNzRvPUA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tamar Christina To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] libstdc++: Remove redundant macro that is always empty X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/vendors/ARM/heads/arm-struct-reorg-wip X-Git-Oldrev: ff861d65950ede95b6c28ac720c56d44cff784de X-Git-Newrev: d1aa7705d59e56191c2ccc5594983d8fa0832718 Message-Id: <20200717123904.A5360393FC2F@sourceware.org> Date: Fri, 17 Jul 2020 12:39:04 +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: Fri, 17 Jul 2020 12:39:04 -0000 https://gcc.gnu.org/g:d1aa7705d59e56191c2ccc5594983d8fa0832718 commit d1aa7705d59e56191c2ccc5594983d8fa0832718 Author: Jonathan Wakely Date: Thu Feb 6 10:45:38 2020 +0000 libstdc++: Remove redundant macro that is always empty The __iter_swap class template and explicit specialization are only declared (and used) for C++03 so _GLIBCXX20_CONSTEXPR does nothing here. * include/bits/stl_algobase.h (__iter_swap, __iter_swap): Remove redundant _GLIBCXX20_CONSTEXPR. Diff: --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/stl_algobase.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 76a6e2b542d..50c4dd9b84c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2020-02-06 Jonathan Wakely + + * include/bits/stl_algobase.h (__iter_swap, __iter_swap): Remove + redundant _GLIBCXX20_CONSTEXPR. + 2020-02-05 Jonathan Wakely * include/bits/iterator_concepts.h (iter_reference_t) diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index dc922a0f3d2..efda15f816e 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -139,7 +139,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __iter_swap { template - _GLIBCXX20_CONSTEXPR static void iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b) { @@ -155,14 +154,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __iter_swap { template - _GLIBCXX20_CONSTEXPR static void iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b) { swap(*__a, *__b); } }; -#endif +#endif // C++03 /** * @brief Swaps the contents of two iterators. @@ -205,6 +203,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && __are_same<_ValueType2&, _ReferenceType2>::__value>:: iter_swap(__a, __b); #else + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 187. iter_swap underspecified swap(*__a, *__b); #endif }