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 033831d7fd01df67e29b7e37418f4941ee69bfb3..ceef9db73c813c2062cee329f0609868f68427b4 100644 (file)
--- 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 4656b4f02da1856749bfa8a2a435bbe12cbe6c28..72597f3e9f2e86e2c4cf2671e47ef9820a4f3057 100644 (file)
--- 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,