From 9e1e64ec2b978e81924000db7d4009b92bb5a638 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 21 Mar 2008 18:56:51 +0000 Subject: cp-tree.h (IS_AGGR_TYPE): Rename to MAYBE_CLASS_TYPE_P. 2008-03-21 Paolo Carlini * cp-tree.h (IS_AGGR_TYPE): Rename to MAYBE_CLASS_TYPE_P. (SET_IS_AGGR_TYPE): Rename to SET_CLASS_TYPE_P. (IS_AGGR_TYPE_CODE): Rename to RECORD_OR_UNION_CODE_P. (PROMOTES_TO_AGGR_TYPE): Remove. (CLASS_TYPE_P, TYPE_NON_AGGREGATE_CLASS): Adjust. * typeck.c (unary_complex_lvalue, build_modify_expr, convert_for_initialization): Adjust. * init.c (is_aggr_type): Remove. (is_class_type): Add. (build_offset_ref, build_new_1, build_vec_delete_1, build_vec_init, build_delete): Adjust. * lex.c (make_aggr_type): Remove. (make_class_type): Add. (cxx_make_type): Adjust. * class.c (finish_struct_1, fixed_type_or_null, is_empty_class): Adjust. * decl.c (build_typename_type, make_typename_type, make_unbound_class_template, cxx_init_decl_processing, check_tag_decl, groktypename, start_decl_1, layout_var_decl, check_initializer, cp_finish_decl, build_ptrmemfunc_type, grokparms, grok_op_properties, xref_tag, check_function_type): Adjust. * call.c (check_dtor_name, standard_conversion, implicit_conversion, add_builtin_candidate, add_builtin_candidates, build_user_type_conversion_1, convert_like_real, build_cxx_call, is_subseq, compare_ics): Adjust. * method.c (use_thunk): Adjust. * rtti.c (build_dynamic_cast_1, create_pseudo_type_info, create_tinfo_types): Adjust. * cvt.c (cp_convert_to_pointer, convert_to_pointer_force, build_up_reference, convert_to_reference, convert_from_reference, ocp_convert, build_expr_type_conversion): Adjust. * tree.c (bind_template_template_parm, error_type): Adjust. * dump.c (cp_dump_tree): Adjust. * search.c (lookup_member): Adjust. * friend.c (make_friend_class, do_friend): Adjust. * typeck2.c (store_init_value, process_init_constructor_array, process_init_constructor_record, build_x_arrow, build_m_component_ref, build_functional_cast): Adjust. * pt.c (finish_member_template_decl, process_template_parm, lookup_template_class, tsubst_function_type, tsubst, tsubst_copy_and_build, get_template_base, bt_instantiate_type_proc): Adjust. * semantics.c (begin_class_definition, finish_base_specifier, finish_typeof, cxx_omp_predetermined_sharing, finish_decltype_type): Adjust. * name-lookup.c (constructor_name_p, push_overloaded_decl, do_class_using_decl, lookup_qualified_name, maybe_process_template_type_declaration): Adjust. * decl2.c (grok_array_decl, check_member_template, constrain_class_visibility): Adjust. * parser.c (cp_parser_class_name): Adjust. From-SVN: r133434 --- gcc/cp/typeck2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gcc/cp/typeck2.c') diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 66c35d4..c48a785 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1,7 +1,7 @@ /* Report error messages, build initializers, and perform some front-end optimizations for C++ compiler. Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 + 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Hacked by Michael Tiemann (tiemann@cygnus.com) @@ -583,7 +583,7 @@ store_init_value (tree decl, tree init) if (TREE_CODE (type) == ERROR_MARK) return NULL_TREE; - if (IS_AGGR_TYPE (type)) + if (MAYBE_CLASS_TYPE_P (type)) { gcc_assert (TYPE_HAS_TRIVIAL_INIT_REF (type) || TREE_CODE (init) == CONSTRUCTOR); @@ -848,7 +848,7 @@ process_init_constructor_array (tree type, tree init) we can't rely on the back end to do it for us, so build up TARGET_EXPRs. If the type in question is a class, just build one up; if it's an array, recurse. */ - if (IS_AGGR_TYPE (TREE_TYPE (type))) + if (MAYBE_CLASS_TYPE_P (TREE_TYPE (type))) next = build_functional_cast (TREE_TYPE (type), NULL_TREE); else next = build_constructor (NULL_TREE, NULL); @@ -935,7 +935,7 @@ process_init_constructor_record (tree type, tree init) default-initialization, we can't rely on the back end to do it for us, so build up TARGET_EXPRs. If the type in question is a class, just build one up; if it's an array, recurse. */ - if (IS_AGGR_TYPE (TREE_TYPE (field))) + if (MAYBE_CLASS_TYPE_P (TREE_TYPE (field))) next = build_functional_cast (TREE_TYPE (field), NULL_TREE); else next = build_constructor (NULL_TREE, NULL); @@ -1161,7 +1161,7 @@ build_x_arrow (tree expr) expr = build_non_dependent_expr (expr); } - if (IS_AGGR_TYPE (type)) + if (MAYBE_CLASS_TYPE_P (type)) { while ((expr = build_new_op (COMPONENT_REF, LOOKUP_NORMAL, expr, NULL_TREE, NULL_TREE, @@ -1240,7 +1240,7 @@ build_m_component_ref (tree datum, tree component) } objtype = TYPE_MAIN_VARIANT (TREE_TYPE (datum)); - if (! IS_AGGR_TYPE (objtype)) + if (! MAYBE_CLASS_TYPE_P (objtype)) { error ("cannot apply member pointer %qE to %qE, which is of " "non-class type %qT", @@ -1330,7 +1330,7 @@ build_functional_cast (tree exp, tree parms) return t; } - if (! IS_AGGR_TYPE (type)) + if (! MAYBE_CLASS_TYPE_P (type)) { if (parms == NULL_TREE) return cp_convert (type, integer_zero_node); -- cgit v1.1