OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

constexpr.c, pt.c: Adjust comments.

Browse Source 
* constexpr.c, pt.c: Adjust comments.

	* g++.dg/cpp1y/lambda-generic-69078-1.C: Remove #include.

From-SVN: r254272
This commit is contained in:
Jason Merrill 2017-10-31 13:09:09 -04:00
parent f26881e300
commit 12d0e3aa63
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/constexpr.c
View File

@ -1269,8 +1269,7 @@ cxx_bind_parameters_in_call (const constexpr_ctx *ctx, tree t,
{
x = ctx->object;
/* We don't use cp_build_addr_expr here because we don't want to
capture the object argument until we've chosen a non-static member
function. */
capture the object argument during constexpr evaluation. */
x = build_address (x);
}
bool lval = false;

4
gcc/cp/pt.c
View File

@ -5564,7 +5564,7 @@ push_template_decl_real (tree decl, bool is_friend)
(TI_ARGS (tinfo),
TI_ARGS (get_template_info (DECL_TEMPLATE_RESULT (tmpl)))))
{
error ("template arguments to %qD do not match original"
error ("template arguments to %qD do not match original "
"template %qD", decl, DECL_TEMPLATE_RESULT (tmpl));
if (!uses_template_parms (TI_ARGS (tinfo)))
inform (input_location, "use %<template<>%> for"
@ -12195,7 +12195,7 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain,
We also deal with the peculiar case:
template <class T> struct S {
template <class U> friend void f();
template <class U> friend void f();
};
template <class U> void f() {}
template S<int>;

4
gcc/testsuite/g++.dg/cpp1y/lambda-generic-69078-1.C
View File

@ -2,8 +2,6 @@
// { dg-do run { target c++14 } }
// { dg-options "-Wall" }
#include <cassert>
struct Class {
Class(void (*_param)()) : data(_param) {}
void (*data)();
@ -15,7 +13,7 @@ void funUser(void (*test)(int)) {
void user(Class& c, int i) {
(void)i;
assert (c.data);
if (!c.data) __builtin_abort();
}
void probe() {}