Skip to content

Commit 9092827

Browse files
authored
Merge pull request #3597 from MicrosoftDocs/master
6/2/2021 AM Publish
2 parents df24fc4 + 9803fee commit 9092827

15 files changed

+27
-27
lines changed

docs/build/reference/property-page-xml-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ First, let's open the property pages for a project. Right-click on the project n
3737

3838
![Shows the Visual Studio C++ Project Properties dialog](../media/cpp-property-page-2017.png)
3939

40-
Each node under **Configuration Properties** is called a *rule*. A rule sometimes represents a single tool like the compiler. In general, the term refers to something that has properties, that executes and that may produce some output. Each rule is populated from an XML file in the default rules folder. For example, the C/C++ rule that's shown here is populated by *`cl.xml'*.
40+
Each node under **Configuration Properties** is called a *rule*. A rule sometimes represents a single tool like the compiler. In general, the term refers to something that has properties, that executes and that may produce some output. Each rule is populated from an XML file in the default rules folder. For example, the C/C++ rule that's shown here is populated by *`cl.xml`*.
4141

4242
Each rule has a set of properties, which are organized into *categories*. Each sub-node under a rule represents a category. For example, the **Optimization** node under **C/C++** contains all the optimization-related properties of the compiler tool. The properties and their values get rendered in a grid format on the right pane.
4343

docs/cpp/lambda-expression-syntax.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This article demonstrates the syntax and structural elements of lambda expressio
1313

1414
When you write code, you probably use function pointers and function objects to solve problems and perform calculations, especially when you use [C++ Standard Library algorithms](../standard-library/algorithms.md). Function pointers and function objects each have advantages and disadvantages—for example, function pointers have minimal syntactic overhead but do not retain state within a scope, and function objects can maintain state but require the syntactic overhead of a class definition.
1515

16-
A lambda combines the benefits of function pointers and function objects and avoids their disadvantages. Like a function objects, a lambda is flexible and can maintain state, but unlike a function object, its compact syntax doesn't require an explicit class definition. By using lambdas, you can write code that's less cumbersome and less prone to errors than the code for an equivalent function object.
16+
A lambda combines the benefits of function pointers and function objects and avoids their disadvantages. Like a function object, a lambda is flexible and can maintain state, but unlike a function object, its compact syntax doesn't require an explicit class definition. By using lambdas, you can write code that's less cumbersome and less prone to errors than the code for an equivalent function object.
1717

1818
The following examples compare the use of a lambda to the use of a function object. The first example uses a lambda to print to the console whether each element in a `vector` object is even or odd. The second example uses a function object to accomplish the same task.
1919

docs/error-messages/compiler-warnings/c5050.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The compiler raises C5050 for both of these cases:
3333
```cmd
3434
warning C5050: Possible incompatible environment while
3535
importing module 'm': mismatched C++ versions.
36-
Current "201402" module version "201703"`.
36+
Current "201402" module version "201703".
3737
```
3838

3939
To resolve the issue, use the same compiler command line options for both the module and the consuming code.

docs/error-messages/compiler-warnings/compiler-warning-level-1-c4103.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The following sample generates C4103:
2020
// C4103.h
2121
#pragma pack(push, 4)
2222

23-
// defintions and declarations
23+
// definitions and declarations
2424

2525
// uncomment the following line to resolve
2626
// #pragma pack(pop)

docs/mfc/reference/cmfcribbonfontcombobox-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ BOOL SetFont(
165165

166166
### Parameters
167167

168-
`lpszName*
168+
*lpszName*\
169169
Specifies the name of the font to select.
170170

171171
*nCharSet*<br/>

docs/mfc/reference/cview-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ virtual BOOL OnDrop(
432432

433433
### Parameters
434434

435-
*`pDataObject`*
435+
*`pDataObject`*\
436436
Points to the [`COleDataObject`](../../mfc/reference/coledataobject-class.md) that is dropped into the drop target.
437437

438438
*`dropEffect`*<br/>

docs/overview/cpp-conformance-improvements-2017.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1909,7 +1909,7 @@ The compiler raises C5050 for both of these cases:
19091909
```Output
19101910
warning C5050: Possible incompatible environment while
19111911
importing module 'm': mismatched C++ versions.
1912-
Current "201402" module version "201703"`.
1912+
Current "201402" module version "201703".
19131913
```
19141914

19151915
The compiler also raises [C7536](../error-messages/compiler-errors-2/compiler-error-c7536.md) whenever the *`.ifc`* file has been tampered with. The header of the module interface contains an SHA2 hash of the contents below it. On import, the *`.ifc`* file is hashed, then checked against the hash provided in the header. If these don't match, error C7536 is raised:

docs/overview/cpp-conformance-improvements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ int main()
15661566
This program previously incorrectly compiled and linked, but will now emit error C7631.
15671567

15681568
```Output
1569-
error C7631: '`anonymous-namespace'::x': variable with internal linkage declared but not defined
1569+
error C7631: 'anonymous-namespace::x': variable with internal linkage declared but not defined
15701570
```
15711571

15721572
Such variables must be defined in the same translation unit they're used in. For example, you can provide an explicit initializer or a separate definition.

docs/parallel/amp/reference/extent-class.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The rank of the `extent` object.
7272

7373
## <a name="contains"></a> contains
7474

75-
Indicates whether the specified [index](index-class.md) value is contained within the `extent' object.
75+
Indicates whether the specified [index](index-class.md) value is contained within the `extent` object.
7676

7777
### Syntax
7878

@@ -91,7 +91,7 @@ The `index` value to test.
9191
9292
## <a name="ctor"></a> extent
9393
94-
Initializes a new instance of the `extent' class.
94+
Initializes a new instance of the `extent` class.
9595
9696
### Syntax
9797
@@ -132,7 +132,7 @@ If an array is used to construct an `extent` object, the length of the array mus
132132

133133
## <a name="operator_mod_eq"></a> operator%=
134134

135-
Calculates the modulus (remainder) of each element in the `extent' when that element is divided by a number.
135+
Calculates the modulus (remainder) of each element in the `extent` when that element is divided by a number.
136136

137137
### Syntax
138138

@@ -151,7 +151,7 @@ The `extent` object.
151151

152152
## <a name="operator_star_eq"></a> operator*=
153153

154-
Multiplies each element in the `extent' object by the specified number.
154+
Multiplies each element in the `extent` object by the specified number.
155155

156156
### Syntax
157157

@@ -189,7 +189,7 @@ The new `extent` object.
189189

190190
## <a name="operator_add_add"></a> operator++
191191

192-
Increments each element of the `extent' object.
192+
Increments each element of the `extent` object.
193193

194194
### Syntax
195195

@@ -204,7 +204,7 @@ For the prefix operator, the `extent` object (**`*this`**). For the suffix opera
204204

205205
## <a name="operator_add_eq"></a> operator+=
206206

207-
Adds the specified number to each element of the `extent' object.
207+
Adds the specified number to each element of the `extent` object.
208208

209209
### Syntax
210210

@@ -244,7 +244,7 @@ The new `extent` object.
244244

245245
## <a name="operator_min_min"></a> operator--
246246

247-
Decrements each element in the `extent' object.
247+
Decrements each element in the `extent` object.
248248

249249
### Syntax
250250

@@ -259,7 +259,7 @@ For the prefix operator, the `extent` object (**`*this`**). For the suffix opera
259259

260260
## <a name="operator_div_eq"></a> operator/=
261261

262-
Divides each element in the `extent' object by the specified number.
262+
Divides each element in the `extent` object by the specified number.
263263

264264
### Syntax
265265

@@ -278,7 +278,7 @@ The `extent` object.
278278

279279
## <a name="operator_min_eq"></a> operator-=
280280

281-
Subtracts the specified number from each element of the `extent' object.
281+
Subtracts the specified number from each element of the `extent` object.
282282

283283
### Syntax
284284

@@ -299,7 +299,7 @@ The resulting `extent` object.
299299

300300
## <a name="operator_eq"></a> operator=
301301

302-
Copies the contents of another `extent' object into this one.
302+
Copies the contents of another `extent` object into this one.
303303

304304
### Syntax
305305

@@ -338,7 +338,7 @@ The element that's at the specified index.
338338
339339
## <a name="rank_constant"></a> rank
340340
341-
Stores the rank of the `extent' object.
341+
Stores the rank of the `extent` object.
342342
343343
### Syntax
344344

docs/porting/visual-cpp-change-history-2003-2015.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,7 @@ Although these differences can affect your source code or other build artifacts,
22042204
When this new behavior parses a **`decltype`** expression that includes a type that hasn't been declared yet, the compiler issues compiler error C2039 as a result.
22052205
22062206
```Output
2207-
error C2039: 'type': is not a member of '`global namespace''
2207+
error C2039: 'type': is not a member of 'global namespace'
22082208
```
22092209
22102210
Example 1: use of an undeclared type (before)

docs/porting/visual-cpp-what-s-new-2003-through-2015.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ Although these differences can affect your source code or other build artifacts,
10431043
When this new behavior parses a **`decltype`** expression that includes a type that has not yet been declared, the compiler issues compiler error C2039 as a result.
10441044
10451045
```Output
1046-
error C2039: 'type': is not a member of '`global namespace''
1046+
error C2039: 'type': is not a member of 'global namespace'
10471047
```
10481048

10491049
Example 1: use of an undeclared type (before)
@@ -2005,7 +2005,7 @@ __sptr, __uptr
20052005
20062006
The compiler has breaking changes in this release.
20072007
2008-
- `64-bit native and cross-compilers.
2008+
- 64-bit native and cross-compilers.
20092009
- `/analyze` (Enterprise Code Analysis) compiler option has been added.
20102010
- `/bigobj` compiler option has been added.
20112011
- `/clr:pure`, `/clr:safe`, and `/clr:oldSyntax` have been added. (Later deprecated in Visual Studio 2015 and removed in Visual Studio 2017.)

docs/preprocessor/hdrstop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If none of the **`/Yc`** and **`/Yu`** options or the **`hdrstop`** pragma speci
3939
You can also use preprocessing commands to perform macro replacement as follows:
4040

4141
```C
42-
#define INCLUDE_PATH "c:\\progra~`1\\devstsu~1\\vc\\include\\"
42+
#define INCLUDE_PATH "c:\\progra~1\\devstsu~1\\vc\\include\\"
4343
#define PCH_FNAME "PROG.PCH"
4444
.
4545
.

docs/standard-library/algorithm-functions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9445,7 +9445,7 @@ int main()
94459445
v1_NewEnd3 = unique ( v1.begin( ), v1_NewEnd2, greater<int>( ) );
94469446

94479447
cout << "Removing adjacent elements satisfying the binary\n "
9448-
<< " predicate mod_equal from vector v1 gives ( " ;
9448+
<< " predicate greater<int> from vector v1 gives ( " ;
94499449
for ( v1_Iter3 = v1.begin( ) ; v1_Iter3 != v1_NewEnd3 ; v1_Iter3++ )
94509450
cout << *v1_Iter3 << " ";
94519451
cout << ")." << endl;
@@ -9460,7 +9460,7 @@ Removing adjacent duplicates from vector v1 under the
94609460
binary predicate mod_equal gives
94619461
( 5 4 7 ).
94629462
Removing adjacent elements satisfying the binary
9463-
predicate mod_equal from vector v1 gives ( 5 7 ).
9463+
predicate greater<int> from vector v1 gives ( 5 7 ).
94649464
```
94659465

94669466
## <a name="unique_copy"></a> `unique_copy`

docs/standard-library/chrono-literals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The literals that take a **`long long`** argument return a value or the correspo
6767
The following examples show how to use the `chrono` literals.
6868
6969
```cpp
70-
constexpr auto day = 14d; // If the value > 255`, then the stored value is unspecified.
70+
constexpr auto day = 14d; // If the value > 255, then the stored value is unspecified.
7171
constexpr auto twoDays = 48h;
7272
constexpr auto week = 24h* 7;
7373
constexpr auto my_duration_unit = 108ms;

docs/standard-library/valarray.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Defines the class template valarray and numerous supporting class templates and
1717
**Namespace:** std
1818

1919
> [!NOTE]
20-
> The \<valarray> library uses the `#include <initializer_list>' statement.
20+
> The \<valarray> library uses the `#include <initializer_list>` statement.
2121
2222
## Remarks
2323

0 commit comments

Comments
 (0)