diff options
| author | Marek Polacek <polacek@redhat.com> | 2020-05-07 08:41:54 -0400 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2020-05-07 13:25:14 -0400 |
| commit | d20b71735eef2ea807d74252f78bba10f93b268c (patch) | |
| tree | eb5c3b943d6fbc298618abd928027021198b857d /gcc/cp/search.c | |
| parent | 5438a28a050f8ecea1352134047efeff5111b603 (diff) | |
| download | gcc-d20b71735eef2ea807d74252f78bba10f93b268c.zip gcc-d20b71735eef2ea807d74252f78bba10f93b268c.tar.gz gcc-d20b71735eef2ea807d74252f78bba10f93b268c.tar.bz2 | |
c++: Fix spelling of non-static
I was looking at DR 296 and noticed that we say "nonstatic" instead of
"non-static", which is the version the standard uses. So this patch
fixes the spelling throughout the front end. Did not check e.g.
non-dependent or any other.
* decl.c (grok_op_properties): Fix spelling of non-static.
* typeck.c (build_class_member_access_expr): Likewise.
* g++.dg/other/operator1.C: Adjust expected message.
* g++.dg/overload/operator2.C: Likewise.
* g++.dg/template/error30.C: Likewise.
* g++.old-deja/g++.jason/operator.C: Likewise.
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 6eada2d..d9a2d748 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -631,7 +631,7 @@ protected_accessible_p (tree decl, tree derived, tree type, tree otype) /* [class.protected] When a friend or a member function of a derived class references - a protected nonstatic member of a base class, an access check + a protected non-static member of a base class, an access check applies in addition to those described earlier in clause _class.access_) Except when forming a pointer to member (_expr.unary.op_), the access must be through a pointer to, @@ -921,11 +921,11 @@ struct lookup_field_info { of that class. [class.member.lookup]:If the resulting set of declarations are not all - from sub-objects of the same type, or the set has a nonstatic member + from sub-objects of the same type, or the set has a non-static member and includes members from distinct sub-objects, there is an ambiguity and the program is ill-formed. - This function checks that T contains no nonstatic members. */ + This function checks that T contains no non-static members. */ int shared_member_p (tree t) |