+2004-12-13 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR c++/18968
+ * class.c (build_base_path): Convert the zero constant to the correct
+ type when comparing.
+
2004-12-13 Mark Mitchell <mark@codesourcery.com>
PR c++/18925
/* Now that we've saved expr, build the real null test. */
if (null_test)
- null_test = fold (build2 (NE_EXPR, boolean_type_node,
- expr, integer_zero_node));
+ {
+ tree zero = cp_convert (TREE_TYPE (expr), integer_zero_node);
+ null_test = fold (build2 (NE_EXPR, boolean_type_node,
+ expr, zero));
+ }
/* If this is a simple base reference, express it as a COMPONENT_REF. */
if (code == PLUS_EXPR && !virtual_access