diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 56c11b8..d8ba37d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-04-01 Jason Merrill <jason@redhat.com> + + * semantics.c (maybe_add_lambda_conv_op): Use null_pointer_node + instead of void_zero_node. + 2010-03-31 Dodji Seketeli <dodji@redhat.com> PR c++/43558 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 1678e50..1c47ded 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -5955,7 +5955,8 @@ maybe_add_lambda_conv_op (tree type) body = begin_function_body (); compound_stmt = begin_compound_stmt (0); - arg = build1 (NOP_EXPR, TREE_TYPE (DECL_ARGUMENTS (callop)), void_zero_node); + arg = build1 (NOP_EXPR, TREE_TYPE (DECL_ARGUMENTS (callop)), + null_pointer_node); argvec = make_tree_vector (); VEC_quick_push (tree, argvec, arg); for (arg = DECL_ARGUMENTS (statfn); arg; arg = TREE_CHAIN (arg)) |