aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-10-23 17:14:50 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2019-10-23 17:14:50 +0100
commit30a761c4b5933dcc768fa8d5433f2a3347bcfa8e (patch)
tree0390a584a1922ec63d7c949ee63cc1dc1e0f76c8
parent84a2f4b3a64dfa377d603ee26fff99b80ed93a99 (diff)
downloadgcc-30a761c4b5933dcc768fa8d5433f2a3347bcfa8e.zip
gcc-30a761c4b5933dcc768fa8d5433f2a3347bcfa8e.tar.gz
gcc-30a761c4b5933dcc768fa8d5433f2a3347bcfa8e.tar.bz2
Only qualify function as constexpr for C++14 and later
This helper function is not a valid constexpr function in C++11, so should only be marked constexpr for C++14 and later. * include/debug/helper_functions.h (__valid_range): Change _GLIBCXX_CONSTEXPR to _GLIBCXX14_CONSTEXPR. From-SVN: r277338
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/include/debug/helper_functions.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 55ad108..277fd01 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2019-10-23 Jonathan Wakely <jwakely@redhat.com>
+ * include/debug/helper_functions.h (__valid_range): Change
+ _GLIBCXX_CONSTEXPR to _GLIBCXX14_CONSTEXPR.
+
* include/ext/throw_allocator.h (throw_allocator_base): Qualify
size_t and ptrdiff_t.
diff --git a/libstdc++-v3/include/debug/helper_functions.h b/libstdc++-v3/include/debug/helper_functions.h
index 5a920bb..c3e7478 100644
--- a/libstdc++-v3/include/debug/helper_functions.h
+++ b/libstdc++-v3/include/debug/helper_functions.h
@@ -221,7 +221,7 @@ namespace __gnu_debug
#endif
template<typename _InputIterator>
- _GLIBCXX_CONSTEXPR
+ _GLIBCXX14_CONSTEXPR
inline bool
__valid_range(_InputIterator __first, _InputIterator __last)
{