Skip to content

Commit 76952ec

Browse files
authored
Merge pull request #102 from zmodem/cxx11
Refer to C++11 rather than C++0x
2 parents 94bfafa + 4b3567e commit 76952ec

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

abi-mangling.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<tr><td>oper</td> <td>d</td> <td> V </td> <td> Operator /= </td> </tr>
5757
<tr><td>syn </td> <td>d</td> <td> x </td> <td> Designated array initializer </td> </tr>
5858
<tr><td>syn </td> <td>d</td> <td> X </td> <td> Designated array range initializer </td> </tr>
59-
<tr><td>type</td> <td>D</td> <td> p </td> <td> pack expansion of (C++0x) </td> </tr>
60-
<tr><td>type</td> <td>D</td> <td> t </td> <td> decltype of an id-expression or class member access (C++0x) </td> </tr>
59+
<tr><td>type</td> <td>D</td> <td> p </td> <td> pack expansion of (C++11) </td> </tr>
60+
<tr><td>type</td> <td>D</td> <td> t </td> <td> decltype of an id-expression or class member access (C++11) </td> </tr>
6161
<tr><td>obj </td> <td>D</td> <td> C </td> <td> structured binding declaration (C++1z) </td> </tr>
62-
<tr><td>type</td> <td>D</td> <td> T </td> <td> decltype of an expression (C++0x) </td> </tr>
62+
<tr><td>type</td> <td>D</td> <td> T </td> <td> decltype of an expression (C++11) </td> </tr>
6363
<tr><td>obj </td> <td>D</td> <td> 0 </td> <td> Deleting destructor</td> </tr>
6464
<tr><td>obj </td> <td>D</td> <td> 1 </td> <td> Complete object (in-charge) destructor</td> </tr>
6565
<tr><td>obj </td> <td>D</td> <td> 2 </td> <td> Base object (not-in-charge) destructor</td> </tr>
@@ -107,7 +107,7 @@
107107
<tr><td>oper</td> <td>o</td> <td> o </td> <td> Operator || </td> </tr>
108108
<tr><td>oper</td> <td>o</td> <td> r </td> <td> Operator | </td> </tr>
109109
<tr><td>oper</td> <td>o</td> <td> R </td> <td> Operator |= </td> </tr>
110-
<tr><td>type</td> <td>O</td> <td></td> <td> rvalue reference type (C++0x) </td> </tr>
110+
<tr><td>type</td> <td>O</td> <td></td> <td> rvalue reference type (C++11) </td> </tr>
111111
<tr><td>oper</td> <td>p</td> <td> l </td> <td> Operator + </td> </tr>
112112
<tr><td>oper</td> <td>p</td> <td> L </td> <td> Operator += </td> </tr>
113113
<tr><td>oper</td> <td>p</td> <td> m </td> <td> Operator ->* </td> </tr>

abi.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4923,10 +4923,10 @@ <h5><a href="#mangle.function-type">5.1.5.3 Function types</a></h5>
49234923
</p>
49244924

49254925
<p>
4926-
When a function parameter is a C++0x function parameter pack, its type
4926+
When a function parameter is a C++11 function parameter pack, its type
49274927
is mangled with <code>Dp &lt;<a href="#mangle.type">type</a>&gt;</code>, i.e., its type is a pack
49284928
expansion:
4929-
<pre><font color="blue"><code> &lt;<a name="mangle.type">type</a>&gt; ::= Dp &lt;<a href="#mangle.type">type</a>&gt; # pack expansion (C++0x)
4929+
<pre><font color="blue"><code> &lt;<a name="mangle.type">type</a>&gt; ::= Dp &lt;<a href="#mangle.type">type</a>&gt; # pack expansion (C++11)
49304930
</code></font></pre>
49314931
</p>
49324932

@@ -4939,8 +4939,8 @@ <h5><a href="#mangle.decltype">5.1.5.4 C++11 <code>decltype</code></a></h5>
49394939
the <code>decltype</code> type was parsed. (See farther <a href=#expressions>below</a> for
49404940
the encoding of expressions.)
49414941

4942-
<pre><font color="blue"><code> &lt;decltype&gt; ::= Dt &lt;<a href="#mangle.expression">expression</a>&gt; E # decltype of an id-expression or class member access (C++0x)
4943-
::= DT &lt;<a href="#mangle.expression">expression</a>&gt; E # decltype of an expression (C++0x)
4942+
<pre><font color="blue"><code> &lt;decltype&gt; ::= Dt &lt;<a href="#mangle.expression">expression</a>&gt; E # decltype of an id-expression or class member access (C++11)
4943+
::= DT &lt;<a href="#mangle.expression">expression</a>&gt; E # decltype of an expression (C++11)
49444944
</code></font></pre>
49454945
If the operand expression of <code>decltype</code> is not
49464946
<a href=#instantiation-dependent>instantiation-dependent</a>
@@ -5403,7 +5403,7 @@ <h5><a href="#mangling.declaration-reference">5.1.6.2 References to declared ent
54035403
an <code>&lt;<a href="#mangle.unresolved-qualifier-level">unresolved-qualifier-level</a>&gt;</code> may encode a known
54045404
class type.
54055405
That production is also used for references to nonstatic members with no
5406-
associated expression designating the enclosing object (a C++0x feature).
5406+
associated expression designating the enclosing object (a C++11 feature).
54075407
For example:
54085408
<code><pre> struct Q { int x; } q;
54095409
template&lt;class T> auto f(T p)->decltype(p.x + q.x);

0 commit comments

Comments
 (0)