diff options
author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-19 21:02:27 +0000 |
---|---|---|
committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-19 21:02:27 +0000 |
commit | ce494fcf6cecbd423d44d552e2094b923fac9a22 (patch) | |
tree | d2b59673b254491d2a8bacc1360f3025eb0c68ad /gcc/cp/class.c | |
parent | 57d30ef6dfcbd6677ac31cf232b498edfe0659f7 (diff) | |
download | gcc-ce494fcf6cecbd423d44d552e2094b923fac9a22.tar.gz |
* call.c (reference_binding): Use cp_build_qualified_type_real
and cp_type_quals consistently.
(add_function_candidate): Likewise.
(build_conditional_expr): Likewise.
(convert_like_real): Likewise.
(type_passed_as): Likewise.
* class.c (add_method): Likewise.
(same_signature_p): Likewise.
(layout_class_type): Likewise.
* decl.c (cxx_init_decl_processing): Likewise.
(cp_fname_init): Likewise.
(grokdeclarator): Likewise.
* decl2.c (cp_reconstruct_complex_type): Likewise.
* init.c (build_new_1): Likewise.
* method.c (do_build_copy_constructor): Likewise.
(implicitly_declare_fn): Likewise.
* pt.c (tsubst_aggr_type): Likewise.
(tsubst): Likewise.
* rtti.c (init_rtti_processing): Likewise.
(build_headof): Likewise.
(build_dynamic_cast_1): Likewise.
(tinfo_base_init): Likewise.
(emit_support_tinfos): Likewise.
* semantics.c (capture_decltype): Likewise.
* tree.c (cv_unqualified): Likewise.
* typeck.c (composite_pointer_type): Likewise.
(string_conv_p): Likewise.
* mangle.c (write_CV_qualifiers_for_type): Tweak.
* call.c (initialize_reference): Use CP_TYPE_CONST_P.
* decl.c (start_decl): Likewise.
* semantics.c (finish_compound_literal): Likewise.
* typeck.c (check_return_expr): Use CP_TYPE_VOLATILE_P.
(cp_type_readonly): Remove.
* cp-tree.h: Remove declaration.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159599 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/class.c')
-rw-r--r-- | gcc/cp/class.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 88db80faae8..748e1b33b60 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1048,8 +1048,8 @@ add_method (tree type, tree method, tree using_decl) && ! DECL_STATIC_FUNCTION_P (method) && TREE_TYPE (TREE_VALUE (parms1)) != error_mark_node && TREE_TYPE (TREE_VALUE (parms2)) != error_mark_node - && (TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms1))) - != TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms2))))) + && (cp_type_quals (TREE_TYPE (TREE_VALUE (parms1))) + != cp_type_quals (TREE_TYPE (TREE_VALUE (parms2))))) continue; /* For templates, the return type and template parameters @@ -1868,8 +1868,8 @@ same_signature_p (const_tree fndecl, const_tree base_fndecl) tree types, base_types; types = TYPE_ARG_TYPES (TREE_TYPE (fndecl)); base_types = TYPE_ARG_TYPES (TREE_TYPE (base_fndecl)); - if ((TYPE_QUALS (TREE_TYPE (TREE_VALUE (base_types))) - == TYPE_QUALS (TREE_TYPE (TREE_VALUE (types)))) + if ((cp_type_quals (TREE_TYPE (TREE_VALUE (base_types))) + == cp_type_quals (TREE_TYPE (TREE_VALUE (types)))) && compparms (TREE_CHAIN (base_types), TREE_CHAIN (types))) return 1; } @@ -5102,7 +5102,7 @@ layout_class_type (tree t, tree *virtuals_p) TYPE_UNSIGNED (ftype)); TREE_TYPE (field) = cp_build_qualified_type (TREE_TYPE (field), - TYPE_QUALS (ftype)); + cp_type_quals (ftype)); } } |