diff options
| author | pzhao <pzhao@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-06 05:53:49 +0000 |
|---|---|---|
| committer | pzhao <pzhao@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-06 05:53:49 +0000 |
| commit | dab3247a40d1376d0e1492670884a3041a86f840 (patch) | |
| tree | 92954e8b35bbd7a6aa016c7a22bb701b2b4050f5 /gcc/cp/init.c | |
| parent | 2ab2ce89368289e93c9022aae8689f109c132f5c (diff) | |
| download | gcc-dab3247a40d1376d0e1492670884a3041a86f840.tar.gz | |
/cp
2010-07-06 Shujing Zhao <pearly.zhao@oracle.com>
* cp-tree.h (impl_conv_void): New type.
(convert_to_void): Adjust prototype.
* cvt.c (convert_to_void): Use impl_conv_void, emit and adjust the
diagnostic for easy translation. Change caller.
* typeck.c: Update call to convert_to_void.
* semantics.c: Likewise.
* init.c: Likewise.
/testsuite
2010-07-06 Shujing Zhao <pearly.zhao@oracle.com>
* g++.dg/warn/noeffect2.C: Adjust expected warning.
* g++.dg/warn/volatile1.C: Likewise.
* g++.dg/template/warn1.C: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161863 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 85ad582f2d1..ec7dca936c9 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1374,7 +1374,7 @@ expand_default_init (tree binfo, tree true_exp, tree exp, tree init, int flags, release_tree_vector (parms); if (TREE_SIDE_EFFECTS (rval)) - finish_expr_stmt (convert_to_void (rval, NULL, complain)); + finish_expr_stmt (convert_to_void (rval, ICV_CAST, complain)); } /* This function is responsible for initializing EXP with INIT @@ -2726,7 +2726,7 @@ build_vec_delete_1 (tree base, tree maxindex, tree type, /* Pre-evaluate the SAVE_EXPR outside of the BIND_EXPR. */ body = build2 (COMPOUND_EXPR, void_type_node, base, body); - return convert_to_void (body, /*implicit=*/NULL, tf_warning_or_error); + return convert_to_void (body, ICV_CAST, tf_warning_or_error); } /* Create an unnamed variable of the indicated TYPE. */ |