From: Jason Merrill <jason@redhat.com>
Date: Mon, 20 Feb 2017 06:05:45 +0000 (-0500)
Subject: PR c++/79400 - confusing suggestion of 'noexcept'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bea40d1191260ebd68cbe1f940e1a5b7e1efa09d;p=gcc.git

PR c++/79400 - confusing suggestion of 'noexcept'

	* parser.c (cp_parser_exception_specification_opt): Remove
	suggestion for deprecated dynamic exception-specification.

From-SVN: r245590
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 033831d7fd0..ceef9db73c8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2017-02-19  Jason Merrill  <jason@redhat.com>
 
+	PR c++/79400 - confusing suggestion of 'noexcept'
+	* parser.c (cp_parser_exception_specification_opt): Remove
+	suggestion for deprecated dynamic exception-specification.
+
 	PR c++/79470 - partial ordering with reference parameters
 	* pt.c (unify) [INDIRECT_REF]: Handle pack expansions.
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 4656b4f02da..72597f3e9f2 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23926,8 +23926,8 @@ cp_parser_exception_specification_opt (cp_parser* parser)
 	}
       else if (cxx_dialect >= cxx11 && !in_system_header_at (loc))
 	warning_at (loc, OPT_Wdeprecated,
-		    "dynamic exception specifications are deprecated in C++11;"
-		    " use %<noexcept%> instead");
+		    "dynamic exception specifications are deprecated in "
+		    "C++11");
     }
   /* In C++17, throw() is equivalent to noexcept (true).  throw()
      is deprecated in C++11 and above as well, but is still widely used,