diff options
| author | Jeff Law <law@gcc.gnu.org> | 1998-05-05 17:18:02 -0600 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-05-05 17:18:02 -0600 |
| commit | f5963e617044e79f7658c82ebc9acdccdc56d57b (patch) | |
| tree | 017db6c8be411c52ab98093e94dcce3c7ca3f029 /gcc/cp | |
| parent | 9d1bcb4667cf94ae02b3b3015694a55175be9c9f (diff) | |
| download | gcc-f5963e617044e79f7658c82ebc9acdccdc56d57b.zip gcc-f5963e617044e79f7658c82ebc9acdccdc56d57b.tar.gz gcc-f5963e617044e79f7658c82ebc9acdccdc56d57b.tar.bz2 | |
* Check in merge from gcc2. See ChangeLog.12 for details.
From-SVN: r19553
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7e6d420..eb5c261 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -255,6 +255,10 @@ Wed Apr 15 13:20:06 1998 John Carr <jfc@mit.edu> * errfn.c: Rework to avoid problems when HOST_WIDE_INT is longer than a pointer. +Sun Apr 12 22:31:19 1998 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> + + * cvt.c (cp_convert_to_pointer): Use TYPE_PRECISION. + Fri Apr 10 12:16:49 1998 Benjamin Kosnik <bkoz@loony.cygnus.com> * decl.c (duplicate_decls): Don't warn for redundant decls if diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 92dce8b..836b8ad 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -1,5 +1,5 @@ /* Language-level data type conversion for GNU C++. - Copyright (C) 1987, 88, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. + Copyright (C) 1987, 88, 92-96, 1998 Free Software Foundation, Inc. Hacked by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. @@ -242,7 +242,7 @@ cp_convert_to_pointer (type, expr) if (INTEGRAL_CODE_P (form)) { - if (type_precision (intype) == POINTER_SIZE) + if (TYPE_PRECISION (intype) == POINTER_SIZE) return build1 (CONVERT_EXPR, type, expr); expr = cp_convert (type_for_size (POINTER_SIZE, 0), expr); /* Modes may be different but sizes should be the same. */ diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 361a559..183837c 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1,5 +1,5 @@ /* Build expressions with type checking for C++ compiler. - Copyright (C) 1987, 88, 89, 92-96, 1997 Free Software Foundation, Inc. + Copyright (C) 1987, 88, 89, 92-97, 1998 Free Software Foundation, Inc. Hacked by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. |