From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 3 Nov 2023 12:30:59 +0000 (+0000)
Subject: libstdc++: Replace "_N" in examples of naming conventions
X-Git-Tag: basepoints/gcc-15~5017
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6933c05ade7cf9872e2c953339a5d2867e81bdcb;p=thirdparty%2Fgcc.git

libstdc++: Replace "_N" in examples of naming conventions

The name "_N" is listed as a reserved name on Solaris, so we shouldn't
use it as an example of our naming conventions.

libstdc++-v3/ChangeLog:

	* doc/xml/manual/appendix_contributing.xml: Replace example that
	uses a BADNAME.
	* doc/html/manual/source_code_style.html: Regenerate.
---

diff --git a/libstdc++-v3/doc/html/manual/source_code_style.html b/libstdc++-v3/doc/html/manual/source_code_style.html
index 24e0d693127a..26b7ea577d56 100644
--- a/libstdc++-v3/doc/html/manual/source_code_style.html
+++ b/libstdc++-v3/doc/html/manual/source_code_style.html
@@ -468,7 +468,7 @@
 <br />
       Type names and template formal-argument names: <code class="literal">_[A-Z][^_].*</code><br />
 <br />
-      Examples:  <code class="code">_Helper  _CharT  _N</code><br />
+      Examples:  <code class="code">_Helper  _CharT  _Nm</code><br />
 <br />
       Member data and function names: <code class="literal">_M_.*</code><br />
 <br />
@@ -480,7 +480,7 @@
 <br />
       Don't use names in the same scope that differ only in the prefix,<br />
       e.g. _S_top and _M_top. See <a class="link" href="source_code_style.html#coding_style.bad_identifiers" title="Bad Identifiers">BADNAMES</a> for a list of forbidden names.<br />
-      (The most tempting of these seem to be and "_T" and "__sz".)<br />
+      (The most tempting of these seem to be and "_T" and "_N".)<br />
 <br />
       Names must never have "__" internally; it would confuse name<br />
       unmanglers on some targets. Also, never use "__[0-9]", same reason.<br />
diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index 197c7d9fb40b..a9196493adca 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -887,7 +887,7 @@ indicate a place that may require attention for multi-thread safety.
 
       Type names and template formal-argument names: <literal>_[A-Z][^_].*</literal>
 
-      Examples:  <code>_Helper  _CharT  _N</code>
+      Examples:  <code>_Helper  _CharT  _Nm</code>
 
       Member data and function names: <literal>_M_.*</literal>
 
@@ -899,7 +899,7 @@ indicate a place that may require attention for multi-thread safety.
 
       Don't use names in the same scope that differ only in the prefix,
       e.g. _S_top and _M_top. See <link linkend="coding_style.bad_identifiers">BADNAMES</link> for a list of forbidden names.
-      (The most tempting of these seem to be and "_T" and "__sz".)
+      (The most tempting of these seem to be and "_T" and "_N".)
 
       Names must never have "__" internally; it would confuse name
       unmanglers on some targets. Also, never use "__[0-9]", same reason.