diff options
| author | bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-21 15:11:01 +0000 |
|---|---|---|
| committer | bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-21 15:11:01 +0000 |
| commit | 78a3ccf79ea151ee88bf4d0685febf4726313922 (patch) | |
| tree | 2c5c6a13956a52f196acbc38e0d3704be128feec /gcc/cp/call.c | |
| parent | dd7911020585589e372e73c5839cd1642692d8c4 (diff) | |
| parent | e351d4e77b717e2f54266b9f67e82d78a4bcd75e (diff) | |
| download | gcc-78a3ccf79ea151ee88bf4d0685febf4726313922.tar.gz | |
Merged with trunk at revision 190535.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/cilkplus@190563 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index e5b53043c0d..cc7b6c1009a 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -1928,7 +1928,8 @@ add_function_candidate (struct z_candidate **candidates, for (i = 0; i < len; ++i) { - tree arg, argtype, to_type; + tree argtype, to_type; + tree arg; conversion *t; int is_this; @@ -1938,8 +1939,9 @@ add_function_candidate (struct z_candidate **candidates, if (i == 0 && first_arg != NULL_TREE) arg = first_arg; else - arg = VEC_index (tree, args, - i + skip - (first_arg != NULL_TREE ? 1 : 0)); + arg = CONST_CAST_TREE ( + VEC_index (tree, args, + i + skip - (first_arg != NULL_TREE ? 1 : 0))); argtype = lvalue_type (arg); is_this = (i == 0 && DECL_NONSTATIC_MEMBER_FUNCTION_P (fn) |