diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-02-06 10:45:38 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-02-06 10:48:17 +0000 |
| commit | d1aa7705d59e56191c2ccc5594983d8fa0832718 (patch) | |
| tree | 7ee8b6ac8b5e5b2c55adfbc62cafad7f8ea58ff1 | |
| parent | ff861d65950ede95b6c28ac720c56d44cff784de (diff) | |
| download | gcc-d1aa7705d59e56191c2ccc5594983d8fa0832718.zip gcc-d1aa7705d59e56191c2ccc5594983d8fa0832718.tar.gz gcc-d1aa7705d59e56191c2ccc5594983d8fa0832718.tar.bz2 | |
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<true>): Remove
redundant _GLIBCXX20_CONSTEXPR.
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 76a6e2b..50c4dd9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2020-02-06 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/stl_algobase.h (__iter_swap, __iter_swap<true>): Remove + redundant _GLIBCXX20_CONSTEXPR. + 2020-02-05 Jonathan Wakely <jwakely@redhat.com> * 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 dc922a0..efda15f 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<typename _ForwardIterator1, typename _ForwardIterator2> - _GLIBCXX20_CONSTEXPR static void iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b) { @@ -155,14 +154,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __iter_swap<true> { template<typename _ForwardIterator1, typename _ForwardIterator2> - _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 } |