* call.c (convert_like_real): Fix formatting.
(initialize_reference): When binding a temporary to a base class,
ensure that the nominal copy made is to the derived class, not the
base class.
PR c++/18140
* parser.c (cp_parser_next_token_ends_template_argument_p): Do not
include ">>".
PR c++/17435
* g++.dg/init/ref12.C: New test.
PR c++/18140
* g++.dg/template/shift1.C: New test.
* g++.dg/template/error10.C: Adjust error markers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89738
138bc75d-0d04-0410-961f-
82ee72b054a4
+2004-10-27 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/17435
+ * call.c (convert_like_real): Fix formatting.
+ (initialize_reference): When binding a temporary to a base class,
+ ensure that the nominal copy made is to the derived class, not the
+ base class.
+
+ PR c++/18140
+ * parser.c (cp_parser_next_token_ends_template_argument_p): Do not
+ include ">>".
+
2004-10-27 Andrew Pinski <pinskia@physics.uc.edu>
* decl.c: Move the q after the %.
expr = decl_constant_value (expr);
if (convs->check_copy_constructor_p)
check_constructor_callable (totype, expr);
- return expr;
+ return expr;
case ck_ambig:
/* Call build_user_type_conversion again for the error. */
return build_user_type_conversion
conv = conv->u.next;
/* If the next conversion is a BASE_CONV, skip that too -- but
remember that the conversion was required. */
- if (conv->kind == ck_base && conv->need_temporary_p)
+ if (conv->kind == ck_base)
{
if (conv->check_copy_constructor_p)
check_constructor_callable (TREE_TYPE (expr), expr);
}
/* Use its address to initialize the reference variable. */
expr = build_address (var);
+ if (base_conv_type)
+ expr = convert_to_base (expr,
+ build_pointer_type (base_conv_type),
+ /*check_access=*/true,
+ /*nonnull=*/true);
expr = build2 (COMPOUND_EXPR, TREE_TYPE (expr), init, expr);
}
else
}
/* Returns TRUE iff the next token is the "," or ">" ending a
- template-argument. ">>" is also accepted (after the full
- argument was parsed) because it's probably a typo for "> >",
- and there is a specific diagnostic for this. */
+ template-argument. */
static bool
cp_parser_next_token_ends_template_argument_p (cp_parser *parser)
cp_token *token;
token = cp_lexer_peek_token (parser->lexer);
- return (token->type == CPP_COMMA || token->type == CPP_GREATER
- || token->type == CPP_RSHIFT);
+ return (token->type == CPP_COMMA || token->type == CPP_GREATER);
}
/* Returns TRUE iff the n-th token is a ">", or the n-th is a "[" and the
+2004-10-27 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/17435
+ * g++.dg/init/ref12.C: New test.
+
+ PR c++/18140
+ * g++.dg/template/shift1.C: New test.
+ * g++.dg/template/error10.C: Adjust error markers.
+
2004-10-27 Andrew Pinski <pinskia@physics.uc.edu>
PR tree-opt/17529
--- /dev/null
+// PR c++/17435
+
+extern "C" void abort ();
+
+bool ok;
+
+struct A
+{
+ void func() const
+ {
+ ok = 1;
+ }
+
+ ~A()
+ {
+ if (!ok)
+ abort ();
+ }
+};
+
+struct B : public A
+{
+};
+
+int main()
+{
+ A const& r1 = B();
+ r1.func();
+}
void KFunc(void);
-A<K<&KFunc>> k1; // { dg-error "should be '> >' within" }
-K<&KFunc>> k2; // { dg-error "spurious '>>'" }
+A<K<&KFunc>> k1; // { dg-error "" }
+K<&KFunc>> k2; // { dg-error "" }
--- /dev/null
+// PR c++/18140
+
+template <int N> struct IntHolder {
+ static const int value = N;
+};
+
+template <int N, int S> struct ShrIntHolder {
+ static const int value = IntHolder< N>>S >::value;
+};
+