From 9542943db3fca29644fa2450523d8277e0a74f5f Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 1 Apr 2010 14:48:34 -0400 Subject: [PATCH] semantics.c (maybe_add_lambda_conv_op): Use null_pointer_node instead of void_zero_node. * semantics.c (maybe_add_lambda_conv_op): Use null_pointer_node instead of void_zero_node. From-SVN: r157926 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/semantics.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 56c11b89c89..d8ba37d85b8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-04-01 Jason Merrill + + * semantics.c (maybe_add_lambda_conv_op): Use null_pointer_node + instead of void_zero_node. + 2010-03-31 Dodji Seketeli PR c++/43558 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 1678e5078e8..1c47ded84d0 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))