From e32b9ce4d563696a15e712ba656584466cea67fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Tue, 26 Nov 2019 19:23:11 +0000 Subject: [PATCH] libstdc++: Use C++98 syntax to instantiate input_iterator_tag * include/debug/helper_functions.h (__valid_range_aux): Use C++98 std::input_iterator_tag default constructor invocation. From-SVN: r278731 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/debug/helper_functions.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8e384c76506..23395b178d0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-11-26 François Dumont + * include/debug/helper_functions.h (__valid_range_aux): Use C++98 + std::input_iterator_tag default constructor invocation. + * include/debug/array (array<>::fill): Add C++20 constexpr. (array<>::swap): Likewise. diff --git a/libstdc++-v3/include/debug/helper_functions.h b/libstdc++-v3/include/debug/helper_functions.h index ac93ee04720..0344f27143b 100644 --- a/libstdc++-v3/include/debug/helper_functions.h +++ b/libstdc++-v3/include/debug/helper_functions.h @@ -168,7 +168,7 @@ namespace __gnu_debug std::random_access_iterator_tag) { return - __valid_range_aux(__first, __last, std::input_iterator_tag{}) + __valid_range_aux(__first, __last, std::input_iterator_tag()) && __first <= __last; } @@ -192,7 +192,7 @@ namespace __gnu_debug typename _Distance_traits<_InputIterator>::__type& __dist, std::__false_type) { - if (!__valid_range_aux(__first, __last, std::input_iterator_tag{})) + if (!__valid_range_aux(__first, __last, std::input_iterator_tag())) return false; __dist = __get_distance(__first, __last); -- 2.30.2