From e2c11cd16bd95e02fe5b308f10aa43bd99666b15 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 10 Sep 2019 08:35:40 +0100 Subject: [PATCH] PR libstdc++/91711 fix failing test PR libstdc++/91711 * testsuite/23_containers/span/get_neg.cc: Avoid ambiguity due to 0ul being a valid null pointer constant. From-SVN: r275563 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/testsuite/23_containers/span/get_neg.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6be181413ff..7bb093de366 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2019-09-10 Jonathan Wakely + PR libstdc++/91711 + * testsuite/23_containers/span/get_neg.cc: Avoid ambiguity due to + 0ul being a valid null pointer constant. + * include/std/type_traits (__remove_cv_t): New alias template. (is_void, is_integral, is_floating_point, is_pointer) (is_member_object_pointer, is_member_function_pointer, is_null_pointer) diff --git a/libstdc++-v3/testsuite/23_containers/span/get_neg.cc b/libstdc++-v3/testsuite/23_containers/span/get_neg.cc index 37d188ed073..cd54716b105 100644 --- a/libstdc++-v3/testsuite/23_containers/span/get_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/span/get_neg.cc @@ -24,7 +24,7 @@ int main() { - std::span myspan((int*)nullptr, 0ul); + std::span myspan((int*)nullptr, (std::size_t)0); std::get<0>(myspan); // { dg-error "here" } } // { dg-error "static assertion failed" "" { target *-*-* } 0 } -- 2.30.2