Skip to content

Commit 7f06968

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/cpp-docs-pr into v-dele-1361728-cleanup
2 parents 62da407 + 47b7aaf commit 7f06968

183 files changed

Lines changed: 3585 additions & 3768 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.redirection.json‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6500,6 +6500,116 @@
65006500
"redirect_url": "/cpp/parallel/openmp/reference/openmp-environment-variables#omp-schedule",
65016501
"redirect_document_id": false
65026502
},
6503+
{
6504+
"source_path": "docs/parallel/openmp/reference/omp-destroy-lock.md",
6505+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-destroy-lock",
6506+
"redirect_document_id": false
6507+
},
6508+
{
6509+
"source_path": "docs/parallel/openmp/reference/omp-destroy-nest-lock.md",
6510+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-destroy-nest-lock",
6511+
"redirect_document_id": false
6512+
},
6513+
{
6514+
"source_path": "docs/parallel/openmp/reference/omp-get-dynamic.md",
6515+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-dynamic",
6516+
"redirect_document_id": false
6517+
},
6518+
{
6519+
"source_path": "docs/parallel/openmp/reference/omp-get-max-threads.md",
6520+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-max-threads",
6521+
"redirect_document_id": false
6522+
},
6523+
{
6524+
"source_path": "docs/parallel/openmp/reference/omp-get-nested.md",
6525+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-nested",
6526+
"redirect_document_id": false
6527+
},
6528+
{
6529+
"source_path": "docs/parallel/openmp/reference/omp-get-num-procs.md",
6530+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-num-procs",
6531+
"redirect_document_id": false
6532+
},
6533+
{
6534+
"source_path": "docs/parallel/openmp/reference/omp-get-num-threads.md",
6535+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-num-threads",
6536+
"redirect_document_id": false
6537+
},
6538+
{
6539+
"source_path": "docs/parallel/openmp/reference/omp-get-thread-num.md",
6540+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-thread-num",
6541+
"redirect_document_id": false
6542+
},
6543+
{
6544+
"source_path": "docs/parallel/openmp/reference/omp-get-wtick.md",
6545+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-wtick",
6546+
"redirect_document_id": false
6547+
},
6548+
{
6549+
"source_path": "docs/parallel/openmp/reference/omp-get-wtime.md",
6550+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-get-wtime",
6551+
"redirect_document_id": false
6552+
},
6553+
{
6554+
"source_path": "docs/parallel/openmp/reference/omp-init-lock.md",
6555+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-init-lock",
6556+
"redirect_document_id": false
6557+
},
6558+
{
6559+
"source_path": "docs/parallel/openmp/reference/omp-init-nest-lock.md",
6560+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-init-nest-lock",
6561+
"redirect_document_id": false
6562+
},
6563+
{
6564+
"source_path": "docs/parallel/openmp/reference/omp-in-parallel.md",
6565+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-in-parallel",
6566+
"redirect_document_id": false
6567+
},
6568+
{
6569+
"source_path": "docs/parallel/openmp/reference/omp-set-dynamic.md",
6570+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-dynamic",
6571+
"redirect_document_id": false
6572+
},
6573+
{
6574+
"source_path": "docs/parallel/openmp/reference/omp-set-lock.md",
6575+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-lock",
6576+
"redirect_document_id": false
6577+
},
6578+
{
6579+
"source_path": "docs/parallel/openmp/reference/omp-set-nest-lock.md",
6580+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-nest-lock",
6581+
"redirect_document_id": false
6582+
},
6583+
{
6584+
"source_path": "docs/parallel/openmp/reference/omp-set-nested.md",
6585+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-nested",
6586+
"redirect_document_id": false
6587+
},
6588+
{
6589+
"source_path": "docs/parallel/openmp/reference/omp-set-num-threads.md",
6590+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-set-num-threads",
6591+
"redirect_document_id": false
6592+
},
6593+
{
6594+
"source_path": "docs/parallel/openmp/reference/omp-test-lock.md",
6595+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-test-lock",
6596+
"redirect_document_id": false
6597+
},
6598+
{
6599+
"source_path": "docs/parallel/openmp/reference/omp-test-nest-lock.md",
6600+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-test-nest-lock",
6601+
"redirect_document_id": false
6602+
},
6603+
{
6604+
"source_path": "docs/parallel/openmp/reference/omp-unset-lock.md",
6605+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-unset-lock",
6606+
"redirect_document_id": false
6607+
},
6608+
{
6609+
"source_path": "docs/parallel/openmp/reference/omp-unset-nest-lock.md",
6610+
"redirect_url": "/cpp/parallel/openmp/reference/openmp-functions#omp-unset-nest-lock",
6611+
"redirect_document_id": false
6612+
},
65036613
{
65046614
"source_path": "docs/porting/index.md",
65056615
"redirect_url": "/cpp/porting/visual-cpp-porting-and-upgrading-guide",

‎docs/atl-mfc-shared/reference/crect-class.md‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ A `CRect` contains member variables that define the top-left and bottom-right po
8989

9090
When specifying a `CRect`, you must be careful to construct it so that it is normalized — in other words, such that the value of the left coordinate is less than the right and the top is less than the bottom. For example, a top left of (10,10) and bottom right of (20,20) defines a normalized rectangle but a top left of (20,20) and bottom right of (10,10) defines a non-normalized rectangle. If the rectangle is not normalized, many `CRect` member functions may return incorrect results. (See [CRect::NormalizeRect](#normalizerect) for a list of these functions.) Before you call a function that requires normalized rectangles, you can normalize non-normalized rectangles by calling the `NormalizeRect` function.
9191

92-
Use caution when manipulating a `CRect` with the [CDC::DPtoLP](../../mfc/reference/cdc-class.md#dptolp) and [CDC::LPtoDP](../../mfc/reference/cdc-class.md#lptodp) member functions. If the mapping mode of a display context is such that the y-extent is negative, as in `MM_LOENGLISH`, then `CDC::DPtoLP` will transform the `CRect` so that its top is greater than the bottom. Functions such as `Height` and `Size` will then return negative values for the height of the transformed `CRect`, and the rectangle will be non-normalized.
93-
92+
Use caution when manipulating a `CRect` with the [CDC::DPtoLP](../../mfc/reference/cdc-class.md#dptolp) and [CDC::LPtoDP](../../mfc/reference/cdc-class.md#lptodp) member functions. If the mapping mode of a display context is such that the y-extent is negative, as in `MM_LOENGLISH`, then `CDC::DPtoLP` will transform the `CRect` so that its top is greater than the bottom. Functions such as `Height` and `Size` will then return negative values for the height of the transformed `CRect`, and the rectangle will be non-normalized.
9493

9594
When using overloaded `CRect` operators, the first operand must be a `CRect`; the second can be either a [RECT](../../mfc/reference/rect-structure.md) structure or a `CRect` object.
9695

@@ -245,7 +244,6 @@ rectDest.CopyRect(&rectSource2);
245244
// rectDest is now set to (0, 0, 640, 480)
246245
```
247246
248-
249247
## <a name="crect"></a> CRect::CRect
250248
251249
Constructs a `CRect` object.
@@ -465,7 +463,6 @@ int nHt = rect.Height();
465463
ASSERT(nHt == 40);
466464
```
467465
468-
469466
## <a name="inflaterect"></a> CRect::InflateRect
470467
471468
`InflateRect` inflates `CRect` by moving its sides away from its center.
@@ -601,7 +598,6 @@ CRect rectEmpty(35, 35, 35, 35);
601598
ASSERT(rectEmpty.IsRectEmpty());
602599
```
603600

604-
605601
## <a name="isrectnull"></a> CRect::IsRectNull
606602

607603
Determines whether the top, left, bottom, and right values of `CRect` are all equal to 0.
@@ -695,7 +691,6 @@ rect.MoveToXY(10, 10);
695691
ASSERT(rect == CRect(10, 10, 110, 110));
696692
```
697693
698-
699694
## <a name="movetoy"></a> CRect::MoveToY
700695
701696
Call this function to move the rectangle to the absolute y-coordinate specified by *y*.
@@ -722,7 +717,6 @@ rect.MoveToY(10);
722717
ASSERT(rect == CRect(0, 10, 100, 110));
723718
```
724719

725-
726720
## <a name="normalizerect"></a> CRect::NormalizeRect
727721

728722
Normalizes `CRect` so that both the height and width are positive.
@@ -794,9 +788,7 @@ rect.OffsetRect(230, 230);
794788
ASSERT(rect == CRect(230, 230, 265, 265));
795789
```
796790

797-
798-
## <a name="operator_lpcrect"></a> CRect::operator LPCRECT Converts a `CRect` to an [LPCRECT](../../mfc/reference/data-types-mfc.md).
799-
791+
## <a name="operator_lpcrect"></a> CRect::operator LPCRECT Converts a `CRect` to an [LPCRECT](../../mfc/reference/data-types-mfc.md).
800792

801793
```
802794
operator LPCRECT() const throw();
@@ -808,8 +800,7 @@ When you use this function, you don't need the address-of (**&**) operator. This
808800

809801
## <a name="operator_lprect"></a> CRect::operator LPRECT
810802

811-
Converts a `CRect` to an [LPRECT](../../mfc/reference/data-types-mfc.md).
812-
803+
Converts a `CRect` to an [LPRECT](../../mfc/reference/data-types-mfc.md).
813804

814805
```
815806
operator LPRECT() throw();
@@ -850,7 +841,6 @@ CRect rect2;
850841
ASSERT(rect2 == CRect(0, 0, 127, 168));
851842
```
852843
853-
854844
## <a name="operator_eq_eq"></a> CRect::operator ==
855845
856846
Determines whether `rect` is equal to `CRect` by comparing the coordinates of their upper-left and lower-right corners.
@@ -896,7 +886,6 @@ test.bottom = 25;
896886
ASSERT(rect1 == test);
897887
```
898888

899-
900889
## <a name="operator_neq"></a> CRect::operator !=
901890

902891
Determines whether *rect* is not equal to `CRect` by comparing the coordinates of their upper-left and lower-right corners.
@@ -1088,7 +1077,6 @@ rect1 |= rect2;
10881077
ASSERT(rectResult == rect1);
10891078
```
10901079

1091-
10921080
## <a name="operator_add"></a> CRect::operator +
10931081

10941082
The first two overloads return a `CRect` object that is equal to `CRect` displaced by the specified offsets.
@@ -1132,7 +1120,6 @@ The third overload returns a new `CRect` that is equal to `CRect` inflated by th
11321120
ASSERT(rectResult == rect2);
11331121
```
11341122
1135-
11361123
## <a name="operator_-"></a> CRect::operator -
11371124
11381125
The first two overloads return a `CRect` object that is equal to `CRect` displaced by the specified offsets.
@@ -1176,7 +1163,6 @@ The third overload returns a new `CRect` that is equal to `CRect` deflated by th
11761163
ASSERT(rect2 == rectResult);
11771164
```
11781165

1179-
11801166
## <a name="operator_amp"></a> CRect::operator &amp;
11811167

11821168
Returns a `CRect` that is the intersection of `CRect` and *rect2*.
@@ -1213,7 +1199,6 @@ The intersection is the largest rectangle that is contained in both rectangles.
12131199
ASSERT(rectResult == rect3);
12141200
```
12151201
1216-
12171202
## <a name="operator_or"></a> CRect::operator &#124;
12181203
12191204
Returns a `CRect` that is the union of `CRect` and *rect2*.
@@ -1256,7 +1241,6 @@ CRect rect3;
12561241
ASSERT(rectResult == rect3);
12571242
```
12581243

1259-
12601244
## <a name="ptinrect"></a> CRect::PtInRect
12611245

12621246
Determines whether the specified point lies within `CRect`.
@@ -1343,7 +1327,6 @@ rect.SetRect(256, 256, 512, 512);
13431327
ASSERT(rect == CRect(256, 256, 512, 512));
13441328
```
13451329

1346-
13471330
## <a name="setrectempty"></a> CRect::SetRectEmpty
13481331

13491332
Makes `CRect` a null rectangle by setting all coordinates to zero.

‎docs/atl-mfc-shared/reference/ctime-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ CTime(const DBTIMESTAMP& dbts, int nDST = -1) throw();
131131
Indicates a `CTime` object that already exists.
132132

133133
*time*<br/>
134-
A **__time64_t** time value, which is the number of seconds after January 1, 1970 UTC. Note that this will be adjusted to your local time. For example, if you are in New York and create a `CTime` object by passing a parameter of 0, [CTime::GetMonth](#getmonth) will return 12.
134+
A `__time64_t` time value, which is the number of seconds after January 1, 1970 UTC. Note that this will be adjusted to your local time. For example, if you are in New York and create a `CTime` object by passing a parameter of 0, [CTime::GetMonth](#getmonth) will return 12.
135135

136136
*nYear*, *nMonth*, *nDay*, *nHour*, *nMin*, *nSec*<br/>
137137
Indicates the date and time values to be copied into the new `CTime` object.

‎docs/atl/reference/csocketaddr-class.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "CSocketAddr Class | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/22/2018"
55
ms.technology: ["cpp-atl"]
66
ms.topic: "reference"
77
f1_keywords: ["CSocketAddr", "ATLSOCKET/ATL::CSocketAddr", "ATLSOCKET/ATL::CSocketAddr::CSocketAddr", "ATLSOCKET/ATL::CSocketAddr::FindAddr", "ATLSOCKET/ATL::CSocketAddr::FindINET4Addr", "ATLSOCKET/ATL::CSocketAddr::FindINET6Addr", "ATLSOCKET/ATL::CSocketAddr::GetAddrInfo", "ATLSOCKET/ATL::CSocketAddr::GetAddrInfoList"]
@@ -44,7 +44,7 @@ class CSocketAddr
4444

4545
This class provides an IP version agnostic approach for looking up network addresses for use with Windows sockets API functions and socket wrappers in libraries.
4646

47-
The members of this class that are used to look up network addresses use the Win32 API function [getaddrinfo](/windows/desktop/api/ws2tcpip/nf-ws2tcpip-getaddrinfo).
47+
The members of this class that are used to look up network addresses use the Win32 API function [getaddrinfo](/windows/desktop/api/ws2tcpip/nf-ws2tcpip-getaddrinfo). The ANSI or UNICODE version of the function is called depending on whether your code is compiled for ANSI or UNICODE.
4848

4949
This class supports both IPv4 andIPv6 network addresses.
5050

@@ -70,15 +70,15 @@ Call this method to convert the provided host name to the host address.
7070

7171
```
7272
int FindAddr(
73-
const char *szHost,
74-
const char *szPortOrServiceName,
73+
const TCHAR *szHost,
74+
const TCHAR *szPortOrServiceName,
7575
int flags,
7676
int addr_family,
7777
int sock_type,
7878
int ai_proto);
7979
8080
int FindAddr(
81-
const char *szHost,
81+
const TCHAR *szHost,
8282
int nPortNo,
8383
int flags,
8484
int addr_family,
@@ -123,10 +123,10 @@ Call this method to convert the IPv4 host name to the host address.
123123

124124
```
125125
int FindINET4Addr(
126-
const char *szHost,
126+
const TCHAR *szHost,
127127
int nPortNo,
128-
int flags,
129-
int sock_type,);
128+
int flags = 0,
129+
int sock_type = SOCK_STREAM);
130130
```
131131

132132
### Parameters
@@ -157,10 +157,10 @@ Call this method to convert the IPv6 host name to the host address.
157157

158158
```
159159
int FindINET6Addr(
160-
const char *szHost,
160+
const TCHAR *szHost,
161161
int nPortNo,
162-
int flags,
163-
int sock_type,);
162+
int flags = 0,
163+
int sock_type = SOCK_STREAM);
164164
```
165165

166166
### Parameters
@@ -190,7 +190,7 @@ This method calls the Win32 API function [getaddrinfo](/windows/desktop/api/ws2t
190190
Call this method to return a pointer to a specific element in the `addrinfo` list.
191191

192192
```
193-
addrinfo* const GetAddrInfoint nIndex = 0) const;
193+
addrinfo* const GetAddrInfo(int nIndex = 0) const;
194194
```
195195

196196
### Parameters

‎docs/build/reference/oy-frame-pointer-omission.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Suppresses creation of frame pointers on the call stack.
2222
2323
## Remarks
2424

25-
This option speeds function calls, because no frame pointers need to be set up and removed. It also frees one more register, (EBP on the Intel 386 or later) for storing frequently used variables and sub-expressions.
25+
This option speeds function calls, because no frame pointers need to be set up and removed. It also frees one more register for general usage.
2626

2727
**/Oy** enables frame-pointer omission and **/Oy-** disables omission. **/Oy** is available only in x86 compilers.
2828

@@ -52,4 +52,4 @@ The **/Oy** compiler option makes using the debugger more difficult because the
5252

5353
[Compiler Options](../../build/reference/compiler-options.md)
5454

55-
[Setting Compiler Options](../../build/reference/setting-compiler-options.md)
55+
[Setting Compiler Options](../../build/reference/setting-compiler-options.md)

‎docs/c-language/abort-function-c.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "abort Function (C) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/24/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
77
dev_langs: ["C++"]
@@ -15,8 +15,8 @@ ms.workload: ["cplusplus"]
1515

1616
**ANSI 4.10.4.1** The behavior of the **abort** function with regard to open and temporary files
1717

18-
The **abort** function does not close files that are open or temporary. It does not flush stream buffers.
18+
The **abort** function does not close files that are open or temporary. It does not flush stream buffers. For more information, see [abort](../c-runtime-library/reference/abort.md).
1919

2020
## See Also
2121

22-
[Library Functions](../c-language/library-functions.md)
22+
[Library Functions](../c-language/library-functions.md)

0 commit comments

Comments
 (0)