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/init.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/init.c')
-rw-r--r-- | gcc/cp/init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index c7ae940..e2e547a 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -160,7 +160,7 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p, -- if T is a scalar type, the storage is set to the value of zero converted to T. - -- if T is a non-union class type, the storage for each nonstatic + -- if T is a non-union class type, the storage for each non-static data member and each base-class subobject is zero-initialized. -- if T is a union type, the storage for its first data member is @@ -2221,8 +2221,8 @@ build_offset_ref (tree type, tree member, bool address_p, /* If MEMBER is non-static, then the program has fallen afoul of [expr.prim]: - An id-expression that denotes a nonstatic data member or - nonstatic member function of a class can only be used: + An id-expression that denotes a non-static data member or + non-static member function of a class can only be used: -- as part of a class member access (_expr.ref_) in which the object-expression refers to the member's class or a class @@ -2230,8 +2230,8 @@ build_offset_ref (tree type, tree member, bool address_p, -- to form a pointer to member (_expr.unary.op_), or - -- in the body of a nonstatic member function of that class or - of a class derived from that class (_class.mfct.nonstatic_), or + -- in the body of a non-static member function of that class or + of a class derived from that class (_class.mfct.non-static_), or -- in a mem-initializer for a constructor for that class or for a class derived from that class (_class.base.init_). */ |