From 96d8488248db69df9d3ee03b93d89012c0dae96a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 7 Mar 2008 11:47:20 +0000 Subject: revert: re PR c++/35049 (g++.dg/conversion/simd3.C:12: error: invalid operands to binary + (have 'float __vector__' and 'int __vector__')) cp: 2008-03-07 Paolo Bonzini Revert: 2008-02-06 Douglas Gregor PR c++/35049 PR c++/35096 * typeck.c (structural_comptypes): Call cp_comptypes. (comptypes): New; called from the C/C++ common bits to perform strict checks. (cp_comptypes): Renamed from comptypes, which is already used, with a different signature, by the C++ front end. (build_reinterpret_cast_1): Call cp_comptypes. (ptr_reasonably_similar): Ditto. * decl.c (decls_match): Ditto. * cvt.c (convert_to_reference): Ditto. * cp-tree.h (same_type_p): Ditto. (same_or_base_type_p): Ditto. (comptypes): Rename to cp_comptypes. * pt.c (canonical_type_parameter): Call cp_comptypes. objcp: 2008-03-07 Paolo Bonzini Revert: 2008-02-07 Andreas Tobler Douglas Gregor PR bootstrap/35115 * objcp-decl.c (objcp_comptypes): Call cp_comptypes, not comptypes. From-SVN: r133007 --- gcc/objcp/ChangeLog | 10 ++++++++++ gcc/objcp/objcp-decl.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'gcc/objcp') diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index e919ad2..227f52e 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,13 @@ +2008-03-07 Paolo Bonzini + + Revert: + + 2008-02-07 Andreas Tobler + Douglas Gregor + + PR bootstrap/35115 + * objcp-decl.c (objcp_comptypes): Call cp_comptypes, not comptypes. + 2008-02-07 Andreas Tobler Douglas Gregor diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c index 8197dbe..12a73c1 100644 --- a/gcc/objcp/objcp-decl.c +++ b/gcc/objcp/objcp-decl.c @@ -95,7 +95,7 @@ objcp_xref_tag (enum tree_code code ATTRIBUTE_UNUSED, tree name) int objcp_comptypes (tree type1, tree type2) { - return cp_comptypes (type1, type2, COMPARE_STRICT); + return comptypes (type1, type2, COMPARE_STRICT); } tree -- cgit v1.1