* semantics.c (maybe_add_lambda_conv_op): Use null_pointer_node

	instead of void_zero_node.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157926 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0a1bce8..5bc6630 100644 (file)
--- 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
 2010-03-31  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/43558

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index b0e2150..f89356c 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5953,7 +5953,8 @@ maybe_add_lambda_conv_op (tree type)
   body = begin_function_body ();
   compound_stmt = begin_compound_stmt (0);
 
   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))
   argvec = make_tree_vector ();
   VEC_quick_push (tree, argvec, arg);
   for (arg = DECL_ARGUMENTS (statfn); arg; arg = TREE_CHAIN (arg))