From 1a08d2da0e685413192921aaced414d450f3ef5b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 26 Sep 2016 11:17:53 +0100 Subject: [PATCH] Remove redefinition of __cpp_lib_array_constexpr * include/bits/range_access.h (__cpp_lib_array_constexpr): Do not redefine macro defined in . From-SVN: r240488 --- libstdc++-v3/ChangeLog | 3 +++ 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 04ec1f1c6f4..2cffae4051b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-09-26 Jonathan Wakely + * include/bits/range_access.h (__cpp_lib_array_constexpr): Do not + redefine macro defined in . + * 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 27cc8ede458..95c3d52099a 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. -- 2.30.2