aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-09-10 08:35:40 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2019-09-10 08:35:40 +0100
commite2c11cd16bd95e02fe5b308f10aa43bd99666b15 (patch)
treee707f1f1743afb95bf918686e96e900203e7fb44
parent391d5d2e30aee5c2c6cce96399758e8ade836536 (diff)
downloadgcc-e2c11cd16bd95e02fe5b308f10aa43bd99666b15.zip
gcc-e2c11cd16bd95e02fe5b308f10aa43bd99666b15.tar.gz
gcc-e2c11cd16bd95e02fe5b308f10aa43bd99666b15.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/testsuite/23_containers/span/get_neg.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6be1814..7bb093d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
2019-09-10 Jonathan Wakely <jwakely@redhat.com>
+ 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 37d188e..cd54716 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<int, std::dynamic_extent> myspan((int*)nullptr, 0ul);
+ std::span<int, std::dynamic_extent> myspan((int*)nullptr, (std::size_t)0);
std::get<0>(myspan); // { dg-error "here" }
}
// { dg-error "static assertion failed" "" { target *-*-* } 0 }