Skip to content

Commit 185b8ee

Browse files
authored
Merge pull request #1618 from MicrosoftDocs/master
12/14 AM Publish
2 parents 6990f84 + 3ef94c6 commit 185b8ee

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/cpp/alignof-and-alignas-cpp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The **alignas** type specifier is a portable, C++ standard way to specify custom
99

1010
## Example
1111

12-
You can use **alignas** on a class, struck or union, or on individual members. When multiple **alignas** specifiers are encountered, the compiler will choose the strictest one, (the one with the largest value).
12+
You can use **alignas** on a class, struct or union, or on individual members. When multiple **alignas** specifiers are encountered, the compiler will choose the strictest one, (the one with the largest value).
1313

1414
```cpp
1515
// alignas_alignof.cpp
@@ -32,4 +32,4 @@ int main()
3232

3333
## See also
3434

35-
[Alignment](../cpp/alignment-cpp-declarations.md)
35+
[Alignment](../cpp/alignment-cpp-declarations.md)

docs/mfc/reference/cdwordarray-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ for example, translates to
5757

5858
|Name|Description|
5959
|----------|-----------------|
60-
|[CObArray::operator [ ]](../../mfc/reference/cobarray-class.md#operator_at)|Sets or gets the element at the specified index.|
60+
|[CObArray::operator \[ \]](../../mfc/reference/cobarray-class.md#operator_at)|Sets or gets the element at the specified index.|
6161

6262
## Remarks
6363

docs/standard-library/vector-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,8 @@ int main( )
12081208
cout << " " << *Iter;
12091209
cout << endl;
12101210

1211-
v1.insert( v1.begin( )+1, v1.begin( )+2, v1.begin( )+4 );
1211+
const auto v2 = v1;
1212+
v1.insert( v1.begin( )+1, v2.begin( )+2, v2.begin( )+4 );
12121213
cout << "v1 =";
12131214
for (Iter = v1.begin( ); Iter != v1.end( ); Iter++ )
12141215
cout << " " << *Iter;
@@ -1220,7 +1221,6 @@ int main( )
12201221
vv1.insert( vv1.begin(), move( v1 ) );
12211222
if ( vv1.size( ) != 0 && vv1[0].size( ) != 0 )
12221223
{
1223-
vector < vector <int> >::iterator Iter;
12241224
cout << "vv1[0] =";
12251225
for (Iter = vv1[0].begin( ); Iter != vv1[0].end( ); Iter++ )
12261226
cout << " " << *Iter;

0 commit comments

Comments
 (0)