public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Sebor <msebor@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-1760] Adjust text of expected warnings changed in PR c++/86568.
Date: Wed,  1 Jul 2020 14:33:52 +0000 (GMT)	[thread overview]
Message-ID: <20200701143352.03B8B386184C@sourceware.org> (raw)

https://gcc.gnu.org/g:8461191b826654a30eaaa57257bcca8e548f11c2

commit r11-1760-g8461191b826654a30eaaa57257bcca8e548f11c2
Author: Martin Sebor <msebor@redhat.com>
Date:   Wed Jul 1 08:30:52 2020 -0600

    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.

Diff:
---
 .../21_strings/basic_string_view/cons/char/nonnull.cc        |  6 +++---
 .../21_strings/basic_string_view/cons/wchar_t/nonnull.cc     |  6 +++---
 .../basic_string_view/operations/compare/char/nonnull.cc     |  4 ++--
 .../basic_string_view/operations/find/char/nonnull.cc        | 12 ++++++------
 .../basic_string_view/operations/rfind/char/nonnull.cc       |  4 ++--
 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 dc93cd67a1f..81c6fc5d29a 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 ded89c2ce45..ce95884e5de 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 0deba716ed3..7060ffb0109 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 d097866b704..97c7629d388 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 55119b59a8f..91525a54d1a 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" }
 }


                 reply	other threads:[~2020-07-01 14:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200701143352.03B8B386184C@sourceware.org \
    --to=msebor@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).