diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 2 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 972ef79..754d66c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2019-11-12 Martin Liska <mliska@suse.cz> + + * name-lookup.c (namespace_hints::namespace_hints): Replace old parameter syntax + with the new one, include opts.h if needed. Use SET_OPTION_IF_UNSET + macro. + * typeck.c (comptypes): Likewise. + 2019-11-12 Maciej W. Rozycki <macro@codesourcery.com> Frederik Harwath <frederik@codesourcery.com> diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index cd0d955..be846a1 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -5358,7 +5358,7 @@ namespace_hints::namespace_hints (location_t loc, tree name) m_candidates = vNULL; m_limited = false; - m_limit = PARAM_VALUE (CXX_MAX_NAMESPACES_FOR_DIAGNOSTIC_HELP); + m_limit = param_cxx_max_namespaces_for_diagnostic_help; /* Breadth-first search of namespaces. Up to limit namespaces searched (limit zero == unlimited). */ diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index ff603f3..d3e7031 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1498,7 +1498,7 @@ comptypes (tree t1, tree t2, int strict) perform a deep check. */ return structural_comptypes (t1, t2, strict); - if (flag_checking && USE_CANONICAL_TYPES) + if (flag_checking && param_use_canonical_types) { bool result = structural_comptypes (t1, t2, strict); @@ -1519,7 +1519,7 @@ comptypes (tree t1, tree t2, int strict) return result; } - if (!flag_checking && USE_CANONICAL_TYPES) + if (!flag_checking && param_use_canonical_types) return TYPE_CANONICAL (t1) == TYPE_CANONICAL (t2); else return structural_comptypes (t1, t2, strict); |