aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1997-09-15 23:35:18 +0000
committerJason Merrill <jason@gcc.gnu.org>1997-09-15 19:35:18 -0400
commit5168dcfc4419b301b0b083738a158b52cf32593e (patch)
treed535cfc27c4e5b51446d2e0be008117bca8fb369
parent4bb437245c40db0a3c3e5bf330892bbe76d015a8 (diff)
downloadgcc-5168dcfc4419b301b0b083738a158b52cf32593e.zip
gcc-5168dcfc4419b301b0b083738a158b52cf32593e.tar.gz
gcc-5168dcfc4419b301b0b083738a158b52cf32593e.tar.bz2
* call.c (null_ptr_cst_p): Integer type, not integral type.
From-SVN: r15463
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/call.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 11b4885..82cd0b6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
Mon Sep 15 11:52:13 1997 Jason Merrill <jason@yorick.cygnus.com>
+ * call.c (null_ptr_cst_p): Integer type, not integral type.
+
* call.c (joust): Disable warnings until they can be moved to the
right place.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index c0152fb..af1f6af 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -2999,7 +2999,7 @@ null_ptr_cst_p (t)
tree t;
{
if (t == null_node
- || integer_zerop (t) && INTEGRAL_TYPE_P (TREE_TYPE (t)))
+ || integer_zerop (t) && TREE_CODE (TREE_TYPE (t)) == INTEGER_TYPE)
return 1;
return 0;
}