aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sebor <msebor@redhat.com>2020-07-01 08:30:52 -0600
committerMartin Sebor <msebor@redhat.com>2020-07-01 08:33:29 -0600
commit8461191b826654a30eaaa57257bcca8e548f11c2 (patch)
treee957085b894f274df273ade62a523cc92f3fa435
parentaa8b5ca0b540fde5890f3114f2d7076d5238fc2e (diff)
downloadgcc-8461191b826654a30eaaa57257bcca8e548f11c2.zip
gcc-8461191b826654a30eaaa57257bcca8e548f11c2.tar.gz
gcc-8461191b826654a30eaaa57257bcca8e548f11c2.tar.bz2
Adjust text of expected warnings changed in PR c++/86568.
libstdc++-v3/ChangeLog: * testsuite/21_strings/basic_string_view/cons/char/nonnull.cc: Adjust text of expected warning. * testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc: Same. * testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc: Same. * testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc: Same. * testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc: Same.
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc6
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc6
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc4
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc12
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc4
5 files changed, 16 insertions, 16 deletions
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc
index dc93cd6..81c6fc5 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/nonnull.cc
@@ -23,7 +23,7 @@
void
test01()
{
- std::string_view s((const char*)nullptr); // { dg-warning "null arg" }
- std::string_view t((char*)nullptr); // { dg-warning "null arg" }
- std::string_view u(nullptr); // { dg-warning "null arg" }
+ std::string_view s((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ std::string_view t((char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ std::string_view u(nullptr); // { dg-warning "\\\[-Wnonnull" }
}
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc
index ded89c2..ce95884 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/nonnull.cc
@@ -23,7 +23,7 @@
void
test01()
{
- std::wstring_view s((const wchar_t*)nullptr); // { dg-warning "null arg" }
- std::wstring_view t((wchar_t*)nullptr); // { dg-warning "null arg" }
- std::wstring_view u(nullptr); // { dg-warning "null arg" }
+ std::wstring_view s((const wchar_t*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ std::wstring_view t((wchar_t*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ std::wstring_view u(nullptr); // { dg-warning "\\\[-Wnonnull" }
}
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc
index 0deba71..7060ffb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/nonnull.cc
@@ -24,6 +24,6 @@ int
test01()
{
std::string_view s = "abcd";
- return s.compare((const char*)nullptr); // { dg-warning "null arg" }
- return s.compare(0, 2, (const char*)nullptr); // { dg-warning "null arg" }
+ return s.compare((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ return s.compare(0, 2, (const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
}
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc
index d097866..97c7629 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/find/char/nonnull.cc
@@ -24,10 +24,10 @@ int
test01()
{
std::string_view s = "abcd";
- return s.find((const char*)nullptr); // { dg-warning "null arg" }
- return s.find((const char*)nullptr, 1); // { dg-warning "null arg" }
- return s.find_first_of((const char*)nullptr); // { dg-warning "null arg" }
- return s.find_first_of((const char*)nullptr, 1); // { dg-warning "null arg" }
- return s.find_first_not_of((const char*)nullptr); // { dg-warning "null arg" }
- return s.find_first_not_of((const char*)nullptr, 1); // { dg-warning "null arg" }
+ return s.find((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ return s.find((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" }
+ return s.find_first_of((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ return s.find_first_of((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" }
+ return s.find_first_not_of((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ return s.find_first_not_of((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" }
}
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc
index 55119b5..91525a5 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/rfind/char/nonnull.cc
@@ -24,6 +24,6 @@ int
test01()
{
std::string_view s = "abcd";
- return s.rfind((const char*)nullptr); // { dg-warning "null arg" }
- return s.rfind((const char*)nullptr, 1); // { dg-warning "null arg" }
+ return s.rfind((const char*)nullptr); // { dg-warning "\\\[-Wnonnull" }
+ return s.rfind((const char*)nullptr, 1); // { dg-warning "\\\[-Wnonnull" }
}