aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Rodrigues <rodrigc@gcc.gnu.org>2002-02-24 18:57:38 +0000
committerCraig Rodrigues <rodrigc@gcc.gnu.org>2002-02-24 18:57:38 +0000
commit3387d36e96b4de9fa1a14eda0a569a8cf5067877 (patch)
tree4e723e9f8d4bd65f12c4f809d56d6899fdbedfa4
parenta7261b2da02de7d8adc2640bb7751706d5cfeb53 (diff)
downloadgcc-3387d36e96b4de9fa1a14eda0a569a8cf5067877.zip
gcc-3387d36e96b4de9fa1a14eda0a569a8cf5067877.tar.gz
gcc-3387d36e96b4de9fa1a14eda0a569a8cf5067877.tar.bz2
re PR c++/4093 (Return type mis-match for (a?b:c) constructs in gcc/cp/cp-tree.h)
2002-02-24 Craig Rodrigues <rodrigc@gcc.gnu.org> PR c++/4093 * cp-tree.h (SET_BINFO_MARKED): Cast false part of condition to void. From-SVN: r50008
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/cp-tree.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index bf470d1..9cd1487 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-24 Craig Rodrigues <rodrigc@gcc.gnu.org>
+
+ PR c++/4093
+ * cp-tree.h (SET_BINFO_MARKED): Cast false part of condition
+ to void.
+
2002-02-22 Jakub Jelinek <jakub@redhat.com>
PR other/5746
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index ad82612..6581132 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1586,7 +1586,7 @@ struct lang_type
#define SET_BINFO_MARKED(NODE) \
(TREE_VIA_VIRTUAL(NODE) \
? SET_CLASSTYPE_MARKED (BINFO_TYPE (NODE)) \
- : (TREE_LANG_FLAG_0 (NODE) = 1))
+ : (void)(TREE_LANG_FLAG_0 (NODE) = 1))
#define CLEAR_BINFO_MARKED(NODE) \
(TREE_VIA_VIRTUAL (NODE) \
? CLEAR_CLASSTYPE_MARKED (BINFO_TYPE (NODE)) \