From ef09717a89c4ab90719e9b4c17b3acbfdf10a621 Mon Sep 17 00:00:00 2001
From: Nathanael Nerode <neroden@gcc.gnu.org>
Date: Sat, 2 Aug 2003 02:07:49 +0000
Subject: [PATCH] typeck2.c (add_exception_specifier): Use 'bool' where
appropriate.
(cp)
* typeck2.c (add_exception_specifier): Use 'bool' where appropriate.
From-SVN: r70094
---
gcc/cp/ChangeLog | 4 ++++
gcc/cp/typeck2.c | 12 ++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9ce5c5e3d698..3ec348a393f0 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-01 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * typeck2.c (add_exception_specifier): Use 'bool' where appropriate.
+
2003-08-01 Mark Mitchell <mark@codesourcery.com>
PR c++/11697
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index a27df4fdf82f..eac8dc156980 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1191,9 +1191,9 @@ build_functional_cast (tree exp, tree parms)
tree
add_exception_specifier (tree list, tree spec, int complain)
{
- int ok;
+ bool ok;
tree core = spec;
- int is_ptr;
+ bool is_ptr;
int diag_type = -1; /* none */
if (spec == error_mark_node)
@@ -1208,16 +1208,16 @@ add_exception_specifier (tree list, tree spec, int complain)
if (is_ptr || TREE_CODE (core) == REFERENCE_TYPE)
core = TREE_TYPE (core);
if (complain < 0)
- ok = 1;
+ ok = true;
else if (VOID_TYPE_P (core))
ok = is_ptr;
else if (TREE_CODE (core) == TEMPLATE_TYPE_PARM)
- ok = 1;
+ ok = true;
else if (processing_template_decl)
- ok = 1;
+ ok = true;
else
{
- ok = 1;
+ ok = true;
/* 15.4/1 says that types in an exception specifier must be complete,
but it seems more reasonable to only require this on definitions
and calls. So just give a pedwarn at this point; we will give an
--
GitLab