Skip to content

Commit 459d005

Browse files
authored
Merge pull request #2968 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents 7296f94 + d2c8efe commit 459d005

8 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎docs/build/reference/cetcompat.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ The **/CETCOMPAT** option is available beginning in the Visual Studio 2019 Previ
3535

3636
1. In the dropdown control, choose **Yes (/CETCOMPAT)** to enable EH continuation metadata, or **No (/CETCOMPAT:NO)** to disable it.
3737

38-
3938
### To set this linker option programmatically
4039

4140
This option does not have a programmatic equivalent.

‎docs/c-runtime-library/reference/strtod-strtod-l-wcstod-wcstod-l.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ The locale to use.
5252
**strtod** returns the value of the floating-point number, except when the representation would cause an overflow, in which case the function returns +/-**HUGE_VAL**. The sign of **HUGE_VAL** matches the sign of the value that cannot be represented. **strtod** returns `0` if no conversion can be performed or an underflow occurs.
5353

5454
**wcstod** returns values analogously to **strtod**:
55+
5556
- For both functions, **errno** is set to **ERANGE** if overflow or underflow occurs.
5657
- If there are invalid parameters, **errno** is set to **EINVAL** and the invalid parameter handler is invoked, as described in [Parameter Validation](../../c-runtime-library/parameter-validation.md).
5758

‎docs/cpp/function-call-operator-parens.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The arguments to the function-call operator come from an *`argument-expression-l
2020

2121
The *`postfix-expression`* evaluates to the function to call. It can take any of several forms:
2222

23-
- a function identifier, visible in the current scope or in the scope of any of the function arguments provided,
23+
- a function identifier, visible in the current scope or in the scope of any of the function arguments provided,
2424
- an expression that evaluates to a function, a function pointer, a callable object, or to a reference to one,
2525
- a member function accessor, either explicit or implied,
2626
- a dereferenced pointer to a member function.

‎docs/mfc/reference/casyncsocket-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ Use this function when you need to supply advanced options such as the socket ty
470470

471471
```
472472
BOOL CreateEx(
473-
ADDRINFOT* pAI,
473+
ADDRINFOT* pAI,
474474
long lEvent = FD_READ | FD_WRITE | FD_OOB | FD_ACCEPT | FD_CONNECT | FD_CLOSE);
475475
```
476476

‎docs/mfc/reference/cfileexception-class.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ This data member is a public variable of type **int**. The enumerators and their
179179
| `CFileException::diskFull` | 13: The disk is full. |
180180
| `CFileException::endOfFile` | 14: The end of file was reached. |
181181

182-
> [!NOTE]
183-
> These `CFileException` cause enumerators are distinct from the `CArchiveException` cause enumerators.
182+
> [!NOTE]
183+
> These `CFileException` cause enumerators are distinct from the `CArchiveException` cause enumerators.
184184
185-
> [!NOTE]
186-
> `CArchiveException::generic` is deprecated. Use `genericException` instead. If **generic** is used in an application and built with /clr, the resulting syntax errors are not easy to decipher.
185+
> [!NOTE]
186+
> `CArchiveException::generic` is deprecated. Use `genericException` instead. If **generic** is used in an application and built with /clr, the resulting syntax errors are not easy to decipher.
187187
188188
### Example
189189

‎docs/standard-library/span-class.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,14 @@ int main()
334334
{
335335
int a[] = { 0,1,2 };
336336
span<int> mySpan(a);
337-
337+
338338
auto first2 = mySpan.first(2);
339339
cout << "mySpan.first(2): ";
340340
for (auto& i : first2)
341341
{
342342
cout << i;
343343
}
344-
344+
345345
cout << "\nmySpan.first<2>: ";
346346
auto viewSpan = mySpan.first<2>();
347347
for (auto& i : viewSpan)
@@ -459,14 +459,14 @@ int main()
459459
{
460460
int a[] = { 0,1,2 };
461461
span<int> mySpan(a);
462-
462+
463463
auto first2 = mySpan.last(2);
464464
cout << "mySpan.last(2): ";
465465
for (auto& i : last2)
466466
{
467467
cout << i;
468468
}
469-
469+
470470
cout << "\nmySpan.last<2>: ";
471471
auto viewSpan = mySpan.last<2>();
472472
for (auto& i : viewSpan)
@@ -590,7 +590,7 @@ int main()
590590
span<int>::pointer ptr = &mySpan[2];
591591
*ptr = 9;
592592
cout << mySpan[2];
593-
593+
594594
// const pointer
595595
span<int>::const_pointer cPtr = &mySpan[0];
596596
// *cPtr = 9; error - const
@@ -925,13 +925,13 @@ using namespace std;
925925
int main()
926926
{
927927
const int MAX=10;
928-
928+
929929
int x[MAX];
930930
for (int i = 0; i < MAX; i++)
931931
{
932932
x[i] = i;
933933
}
934-
934+
935935
span<int, MAX> span1{ x }; // fixed-size span: compiler error if size of x doesn't match template argument MAX
936936
span<int> span2{ x }; // size is inferred from x
937937
span<const int> span3 = span2; // converting constructor
@@ -978,7 +978,7 @@ int main()
978978
{
979979
int a[] = { 0,1,2 };
980980
span<int> mySpan(a);
981-
981+
982982
cout << "mySpan.subspan(1,2): ";
983983
for (auto& i : mySpan.subspan(1,2))
984984
{

‎docs/standard-library/span.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ helpviewer_keywords: ["span header"]
77

88
# &lt;span&gt;
99

10-
A `span` is a view over a contiguous sequence of objects. It provides fast and bounds-safe access. Unlike `vector` or `array`, it doesn't "own" the elements it provides access to.
10+
A `span` is a view over a contiguous sequence of objects. It provides fast and bounds-safe access. Unlike `vector` or `array`, it doesn't "own" the elements it provides access to.
1111

1212
See [span class](span-class.md) for detailed information. Here's an example of how a span can be used:
1313

‎docs/windows/walkthrough-creating-windows-desktop-applications-cpp.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ Next, you'll learn how to create the code for a Windows desktop application in V
380380
```
381381

382382
`HDC` in the code is a handle to a device context, which is used to draw in the window's client area. Use the `BeginPaint` and `EndPaint` functions to prepare for and complete the drawing in the client area. `BeginPaint` returns a handle to the display device context used for drawing in the client area; `EndPaint` ends the paint request and releases the device context.
383-
383+
384384
1. An application typically handles many other messages. For example, [WM_CREATE](/windows/win32/winmsg/wm-create) when a window is first created, and [WM_DESTROY](/windows/win32/winmsg/wm-destroy) when the window is closed. The following code shows a basic but complete `WndProc` function.
385385

386386
```cpp

0 commit comments

Comments
 (0)