diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-09-26 11:17:53 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-09-26 11:17:53 +0100 |
| commit | 1a08d2da0e685413192921aaced414d450f3ef5b (patch) | |
| tree | 0e719fe775c3142fe50b292d11d97b6ef4ebd298 | |
| parent | 976160b962fce53f5ed3fe833af1c9d729327bfb (diff) | |
| download | gcc-1a08d2da0e685413192921aaced414d450f3ef5b.zip gcc-1a08d2da0e685413192921aaced414d450f3ef5b.tar.gz gcc-1a08d2da0e685413192921aaced414d450f3ef5b.tar.bz2 | |
Remove redefinition of __cpp_lib_array_constexpr
* include/bits/range_access.h (__cpp_lib_array_constexpr): Do not
redefine macro defined in <bits/stl_iterator.h>.
From-SVN: r240488
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/range_access.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 04ec1f1..2cffae4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-09-26 Jonathan Wakely <jwakely@redhat.com> + * include/bits/range_access.h (__cpp_lib_array_constexpr): Do not + redefine macro defined in <bits/stl_iterator.h>. + * include/bits/stl_map.h (map::extract(const_iterator)): Assert that iterator is not past-the-end. * include/bits/stl_multimap.h (multimap::extract(const_iterator)): diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h index 27cc8ed..95c3d52 100644 --- a/libstdc++-v3/include/bits/range_access.h +++ b/libstdc++-v3/include/bits/range_access.h @@ -38,10 +38,6 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION -#if __cplusplus >= 201402L -# define __cpp_lib_array_constexpr 201603L -#endif - /** * @brief Return an iterator pointing to the first element of * the container. |