aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-10-16 17:58:29 -0400
committerJason Merrill <jason@gcc.gnu.org>2013-10-16 17:58:29 -0400
commit1a1f2bc5139648b2559404328e0e31966ebb8732 (patch)
tree691bffada06ae0b5f5aa0e7ff8465cb387dda6d5
parent06ea1376317074e9d9f4ddb727b93871f23535c5 (diff)
downloadgcc-1a1f2bc5139648b2559404328e0e31966ebb8732.zip
gcc-1a1f2bc5139648b2559404328e0e31966ebb8732.tar.gz
gcc-1a1f2bc5139648b2559404328e0e31966ebb8732.tar.bz2
error.c (dump_exception_spec): Print "noexcept" rather than "noexcept (true)".
* error.c (dump_exception_spec): Print "noexcept" rather than "noexcept (true)". From-SVN: r203726
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/error.c17
2 files changed, 13 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2852f1f..2091b9f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2013-10-16 Jason Merrill <jason@redhat.com>
+ * error.c (dump_exception_spec): Print "noexcept" rather than
+ "noexcept (true)".
+
Core 1591
* pt.c (unify_array_domain): Split out from unify.
(unify): Use it for list deduction, too.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 0c3cead..3f6f594 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1595,13 +1595,16 @@ dump_exception_spec (cxx_pretty_printer *pp, tree t, int flags)
if (t && TREE_PURPOSE (t))
{
pp_cxx_ws_string (pp, "noexcept");
- pp_cxx_whitespace (pp);
- pp_cxx_left_paren (pp);
- if (DEFERRED_NOEXCEPT_SPEC_P (t))
- pp_cxx_ws_string (pp, "<uninstantiated>");
- else
- dump_expr (pp, TREE_PURPOSE (t), flags);
- pp_cxx_right_paren (pp);
+ if (!integer_onep (TREE_PURPOSE (t)))
+ {
+ pp_cxx_whitespace (pp);
+ pp_cxx_left_paren (pp);
+ if (DEFERRED_NOEXCEPT_SPEC_P (t))
+ pp_cxx_ws_string (pp, "<uninstantiated>");
+ else
+ dump_expr (pp, TREE_PURPOSE (t), flags);
+ pp_cxx_right_paren (pp);
+ }
}
else if (t)
{