summaryrefslogtreecommitdiff
path: root/gcc/cp/init.c
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-12 09:08:47 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-12 09:08:47 +0000
commit05765a912d85eaf2e28a55c8ba923e7fa1153bf3 (patch)
tree7486149a6f3808912b77376a39b4f2c61c6cf9c9 /gcc/cp/init.c
parent1e6d0c169fdb66874b628c5faa94163ccf624650 (diff)
downloadgcc-05765a912d85eaf2e28a55c8ba923e7fa1153bf3.tar.gz
2012-05-12 Paolo Carlini <paolo.carlini@oracle.com>
* doc/generic.texi: Rename TYPE_PTRMEM_P to TYPE_PTRDATAMEM_P. /cp 2012-05-12 Paolo Carlini <paolo.carlini@oracle.com> * cp-tree.h (TYPE_PTRMEM_P): Rename to TYPE_PTRDATAMEM_P. (TYPE_PTR_TO_MEMBER_P): Rename to TYPE_PTRMEM_P. (TYPE_PTR_OR_PTRMEM_P): Add. * typeck.c (composite_pointer_type_r, composite_pointer_type, common_pointer_type, cp_build_indirect_ref, cp_build_binary_op, cp_truthvalue_conversion, convert_ptrmem, build_static_cast_1, build_reinterpret_cast_1, build_const_cast_1, comp_ptr_ttypes_real, casts_away_constness_r, casts_away_constness): Adjust. * init.c (build_zero_init_1): Adjust. * class.c (check_field_decls): Likewise. * decl.c (check_default_argument): Likewise. * rtti.c (target_incomplete_p): Likewise. * tree.c (zero_init_p): Likewise. * cxx-pretty-print.c (pp_cxx_ptr_operator, pp_cxx_abstract_declarator): Likewise. * typeck2.c (build_m_component_ref): Likewise. * pt.c (convert_nontype_argument, invalid_nontype_parm_type_p, dependent_type_p_r): Likewise. * call.c (null_member_pointer_value_p, standard_conversion, add_builtin_candidate, build_conditional_expr_1, compare_ics): Likewise. * cp-objcp-common.c (cp_var_mod_type_p): Likewise. * cvt.c (cp_convert_to_pointer, ocp_convert, perform_qualification_conversions): Likewise. * mangle.c (write_type): Likewise. * name-lookup.c (arg_assoc_type): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187425 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/init.c')
-rw-r--r--gcc/cp/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index e8debb870d6..ca6f14af370 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -178,7 +178,7 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p,
items with static storage duration that are not otherwise
initialized are initialized to zero. */
;
- else if (TYPE_PTR_P (type) || TYPE_PTR_TO_MEMBER_P (type))
+ else if (TYPE_PTR_OR_PTRMEM_P (type))
init = convert (type, nullptr_node);
else if (SCALAR_TYPE_P (type))
init = convert (type, integer_zero_node);