Skip to content

Commit 76c2b5a

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#1705 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)
2 parents a629ee1 + 0e05855 commit 76c2b5a

24 files changed

Lines changed: 219 additions & 443 deletions

‎.openpublishing.redirection.json‎

Lines changed: 132 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -6400,136 +6400,136 @@
64006400
"redirect_url": "/cpp/dotnet/dotnet-programming-with-cpp-cli-visual-cpp",
64016401
"redirect_document_id": false
64026402
},
6403-
{
6404-
"source_path": "docs/dotnet/lock-members.md",
6405-
"redirect_url": "/cpp/dotnet/lock-class",
6406-
"redirect_document_id": false
6407-
},
6408-
{
6409-
"source_path": "docs/dotnet/lock-lock.md",
6410-
"redirect_url": "/cpp/dotnet/lock-class#lock",
6411-
"redirect_document_id": false
6412-
},
6413-
{
6414-
"source_path": "docs/dotnet/lock-tilde-lock.md",
6415-
"redirect_url": "/cpp/dotnet/lock-class#tilde-lock",
6416-
"redirect_document_id": false
6417-
},
6418-
{
6419-
"source_path": "docs/dotnet/lock-is-locked.md",
6420-
"redirect_url": "/cpp/dotnet/lock-class#is-locked",
6421-
"redirect_document_id": false
6422-
},
6423-
{
6424-
"source_path": "docs/dotnet/lock-operator-bool.md",
6425-
"redirect_url": "/cpp/dotnet/lock-class#operator-bool",
6426-
"redirect_document_id": false
6427-
},
6428-
{
6429-
"source_path": "docs/dotnet/lock-acquire.md",
6430-
"redirect_url": "/cpp/dotnet/lock-class#acquire",
6431-
"redirect_document_id": false
6432-
},
6433-
{
6434-
"source_path": "docs/dotnet/lock-try-acquire.md",
6435-
"redirect_url": "/cpp/dotnet/lock-class#try-acquire",
6436-
"redirect_document_id": false
6437-
},
6438-
{
6439-
"source_path": "docs/dotnet/lock-release.md",
6440-
"redirect_url": "/cpp/dotnet/lock-class#release",
6441-
"redirect_document_id": false
6442-
},
6443-
{
6444-
"source_path": "docs/dotnet/lock-operator-equality.md",
6445-
"redirect_url": "/cpp/dotnet/lock-class#operator-equality",
6446-
"redirect_document_id": false
6447-
},
6448-
{
6449-
"source_path": "docs/dotnet/lock-operator-inequality.md",
6450-
"redirect_url": "/cpp/dotnet/lock-class#operator-inequality",
6451-
"redirect_document_id": false
6452-
},
6453-
{
6454-
"source_path": "docs/dotnet/marshal-context-marshal-context.md",
6455-
"redirect_url": "/cpp/dotnet/marshal-context-class#marshal-context",
6456-
"redirect_document_id": false
6457-
},
6458-
{
6459-
"source_path": "docs/dotnet/marshal-context-tilde-marshal-context.md",
6460-
"redirect_url": "/cpp/dotnet/marshal-context-class#tilde-marshal-context",
6461-
"redirect_document_id": false
6462-
},
6463-
{
6464-
"source_path": "docs/dotnet/marshal-context-marshal-as.md",
6465-
"redirect_url": "/cpp/dotnet/marshal-context-class#marshal-as",
6466-
"redirect_document_id": false
6467-
},
6468-
{
6469-
"source_path": "docs/dotnet/ptr-members.md",
6470-
"redirect_url": "/cpp/dotnet/com-ptr-class",
6471-
"redirect_document_id": false
6472-
},
6473-
{
6474-
"source_path": "docs/dotnet/ptr-ptr.md",
6475-
"redirect_url": "/cpp/dotnet/com-ptr-class#ptr",
6476-
"redirect_document_id": false
6477-
},
6478-
{
6479-
"source_path": "docs/dotnet/ptr-tilde-ptr.md",
6480-
"redirect_url": "/cpp/dotnet/com-ptr-class#tilde-ptr",
6481-
"redirect_document_id": false
6482-
},
6483-
{
6484-
"source_path": "docs/dotnet/ptr-attach.md",
6485-
"redirect_url": "/cpp/dotnet/com-ptr-class#attach",
6486-
"redirect_document_id": false
6487-
},
6488-
{
6489-
"source_path": "docs/dotnet/ptr-createinstance.md",
6490-
"redirect_url": "/cpp/dotnet/com-ptr-class#createInstance",
6491-
"redirect_document_id": false
6492-
},
6493-
{
6494-
"source_path": "docs/dotnet/ptr-detach.md",
6495-
"redirect_url": "/cpp/dotnet/com-ptr-class#detach",
6496-
"redirect_document_id": false
6497-
},
6498-
{
6499-
"source_path": "docs/dotnet/ptr-getinterface.md",
6500-
"redirect_url": "/cpp/dotnet/com-ptr-class#getInterface",
6501-
"redirect_document_id": false
6502-
},
6503-
{
6504-
"source_path": "docs/dotnet/ptr-queryinterface.md",
6505-
"redirect_url": "/cpp/dotnet/com-ptr-class#queryInterface",
6506-
"redirect_document_id": false
6507-
},
6508-
{
6509-
"source_path": "docs/dotnet/ptr-release.md",
6510-
"redirect_url": "/cpp/dotnet/com-ptr-class#release",
6511-
"redirect_document_id": false
6512-
},
6513-
{
6514-
"source_path": "docs/dotnet/ptr-operator-assign.md",
6515-
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-assign",
6516-
"redirect_document_id": false
6517-
},
6518-
{
6519-
"source_path": "docs/dotnet/ptr-operator-arrow.md",
6520-
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-arrow",
6521-
"redirect_document_id": false
6522-
},
6523-
{
6524-
"source_path": "docs/dotnet/ptr-operator-logical-not.md",
6525-
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-logical-not",
6526-
"redirect_document_id": false
6527-
},
6528-
{
6529-
"source_path": "docs/dotnet/ptr-operator-bool.md",
6530-
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-bool",
6531-
"redirect_document_id": false
6532-
},
6403+
{
6404+
"source_path": "docs/dotnet/lock-members.md",
6405+
"redirect_url": "/cpp/dotnet/lock-class",
6406+
"redirect_document_id": false
6407+
},
6408+
{
6409+
"source_path": "docs/dotnet/lock-lock.md",
6410+
"redirect_url": "/cpp/dotnet/lock-class#lock",
6411+
"redirect_document_id": false
6412+
},
6413+
{
6414+
"source_path": "docs/dotnet/lock-tilde-lock.md",
6415+
"redirect_url": "/cpp/dotnet/lock-class#tilde-lock",
6416+
"redirect_document_id": false
6417+
},
6418+
{
6419+
"source_path": "docs/dotnet/lock-is-locked.md",
6420+
"redirect_url": "/cpp/dotnet/lock-class#is-locked",
6421+
"redirect_document_id": false
6422+
},
6423+
{
6424+
"source_path": "docs/dotnet/lock-operator-bool.md",
6425+
"redirect_url": "/cpp/dotnet/lock-class#operator-bool",
6426+
"redirect_document_id": false
6427+
},
6428+
{
6429+
"source_path": "docs/dotnet/lock-acquire.md",
6430+
"redirect_url": "/cpp/dotnet/lock-class#acquire",
6431+
"redirect_document_id": false
6432+
},
6433+
{
6434+
"source_path": "docs/dotnet/lock-try-acquire.md",
6435+
"redirect_url": "/cpp/dotnet/lock-class#try-acquire",
6436+
"redirect_document_id": false
6437+
},
6438+
{
6439+
"source_path": "docs/dotnet/lock-release.md",
6440+
"redirect_url": "/cpp/dotnet/lock-class#release",
6441+
"redirect_document_id": false
6442+
},
6443+
{
6444+
"source_path": "docs/dotnet/lock-operator-equality.md",
6445+
"redirect_url": "/cpp/dotnet/lock-class#operator-equality",
6446+
"redirect_document_id": false
6447+
},
6448+
{
6449+
"source_path": "docs/dotnet/lock-operator-inequality.md",
6450+
"redirect_url": "/cpp/dotnet/lock-class#operator-inequality",
6451+
"redirect_document_id": false
6452+
},
6453+
{
6454+
"source_path": "docs/dotnet/marshal-context-marshal-context.md",
6455+
"redirect_url": "/cpp/dotnet/marshal-context-class#marshal-context",
6456+
"redirect_document_id": false
6457+
},
6458+
{
6459+
"source_path": "docs/dotnet/marshal-context-tilde-marshal-context.md",
6460+
"redirect_url": "/cpp/dotnet/marshal-context-class#tilde-marshal-context",
6461+
"redirect_document_id": false
6462+
},
6463+
{
6464+
"source_path": "docs/dotnet/marshal-context-marshal-as.md",
6465+
"redirect_url": "/cpp/dotnet/marshal-context-class#marshal-as",
6466+
"redirect_document_id": false
6467+
},
6468+
{
6469+
"source_path": "docs/dotnet/ptr-members.md",
6470+
"redirect_url": "/cpp/dotnet/com-ptr-class",
6471+
"redirect_document_id": false
6472+
},
6473+
{
6474+
"source_path": "docs/dotnet/ptr-ptr.md",
6475+
"redirect_url": "/cpp/dotnet/com-ptr-class#ptr",
6476+
"redirect_document_id": false
6477+
},
6478+
{
6479+
"source_path": "docs/dotnet/ptr-tilde-ptr.md",
6480+
"redirect_url": "/cpp/dotnet/com-ptr-class#tilde-ptr",
6481+
"redirect_document_id": false
6482+
},
6483+
{
6484+
"source_path": "docs/dotnet/ptr-attach.md",
6485+
"redirect_url": "/cpp/dotnet/com-ptr-class#attach",
6486+
"redirect_document_id": false
6487+
},
6488+
{
6489+
"source_path": "docs/dotnet/ptr-createinstance.md",
6490+
"redirect_url": "/cpp/dotnet/com-ptr-class#createInstance",
6491+
"redirect_document_id": false
6492+
},
6493+
{
6494+
"source_path": "docs/dotnet/ptr-detach.md",
6495+
"redirect_url": "/cpp/dotnet/com-ptr-class#detach",
6496+
"redirect_document_id": false
6497+
},
6498+
{
6499+
"source_path": "docs/dotnet/ptr-getinterface.md",
6500+
"redirect_url": "/cpp/dotnet/com-ptr-class#getInterface",
6501+
"redirect_document_id": false
6502+
},
6503+
{
6504+
"source_path": "docs/dotnet/ptr-queryinterface.md",
6505+
"redirect_url": "/cpp/dotnet/com-ptr-class#queryInterface",
6506+
"redirect_document_id": false
6507+
},
6508+
{
6509+
"source_path": "docs/dotnet/ptr-release.md",
6510+
"redirect_url": "/cpp/dotnet/com-ptr-class#release",
6511+
"redirect_document_id": false
6512+
},
6513+
{
6514+
"source_path": "docs/dotnet/ptr-operator-assign.md",
6515+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-assign",
6516+
"redirect_document_id": false
6517+
},
6518+
{
6519+
"source_path": "docs/dotnet/ptr-operator-arrow.md",
6520+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-arrow",
6521+
"redirect_document_id": false
6522+
},
6523+
{
6524+
"source_path": "docs/dotnet/ptr-operator-logical-not.md",
6525+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-logical-not",
6526+
"redirect_document_id": false
6527+
},
6528+
{
6529+
"source_path": "docs/dotnet/ptr-operator-bool.md",
6530+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-bool",
6531+
"redirect_document_id": false
6532+
},
65336533
{
65346534
"source_path": "docs/error-messages/compiler-errors-1/index.md",
65356535
"redirect_url": "/cpp/error-messages/compiler-errors-1/compiler-fatal-errors-c999-through-c1999",
@@ -11090,5 +11090,6 @@
1109011090
"redirect_url": "/cpp/parallel/openmp/a-examples#a31-thread-safe-lock-functions",
1109111091
"redirect_document_id": false
1109211092
}
11093+
1109311094
]
11094-
}
11095+
}

‎docs/atl/reference/atl-http-utility-functions.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ Returns TRUE on success, FALSE on failure.
7070
7171
Behaves like the current version of [InternetCanonicalizeUrl](/windows/desktop/api/wininet/nf-wininet-internetcanonicalizeurla) but does not require WinInet or Internet Explorer to be installed.
7272
73-
### See Also
74-
75-
[InternetCanonicalizeUrl](/windows/desktop/api/wininet/nf-wininet-internetcanonicalizeurla)
76-
7773
## <a name="atlcombineurl"></a> AtlCombineUrl
7874
7975
Call this function to combine a base URL and a relative URL into a single, canonical URL.
@@ -281,5 +277,6 @@ A reference to a string variable to receive the HTTP date time as defined in RFC
281277

282278
## See Also
283279

284-
[Concepts](../../atl/active-template-library-atl-concepts.md)<br/>
285-
[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)
280+
[Concepts](../active-template-library-atl-concepts.md)<br/>
281+
[ATL COM Desktop Components](../atl-com-desktop-components.md)<br/>
282+
[InternetCanonicalizeUrl](/windows/desktop/api/wininet/nf-wininet-internetcanonicalizeurla)

‎docs/atl/reference/atl-text-encoding-functions.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ The number of characters required for a buffer that could hold encoded data of *
693693

694694
This uuencoding implementation follows the POSIX P1003.2b/D11 specification.
695695

696-
### See Also
696+
## See Also
697697

698-
[Concepts](../../atl/active-template-library-atl-concepts.md)<br/>
699-
[ATL COM Desktop Components](../../atl/atl-com-desktop-components.md)
698+
[Concepts](../active-template-library-atl-concepts.md)<br/>
699+
[ATL COM Desktop Components](../atl-com-desktop-components.md)

‎docs/c-runtime-library/direction-flag.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ ms.assetid: 0836b4af-dbbb-4ab8-a4b2-156f2e2099e2
77
---
88
# Direction Flag
99

10-
The direction flag is a CPU flag specific to Intel 80x86 processors. It applies to all assembly instructions that use the REP (repeat) prefix, such as MOVS, MOVSD, MOVSW, and others. Addresses provided to applicable instructions are increased if the direction flag is cleared.
10+
The direction flag is a CPU flag specific to all Intel x86-compatible CPUs. It applies to all assembly instructions that use the REP (repeat) prefix, such as MOVS, MOVSD, MOVSW, and others. Addresses provided to applicable instructions are increased if the direction flag is cleared.
1111

1212
The C run-time routines assume that the direction flag is cleared. If you are using other functions with the C run-time functions, you must ensure that the other functions leave the direction flag alone or restore it to its original condition. Expecting the direction flag to be clear upon entry makes the run-time code faster and more efficient.
1313

1414
The C Run-Time library functions, such as the string-manipulation and buffer-manipulation routines, expect the direction flag to be clear.
1515

1616
## See Also
1717

18-
[CRT Library Features](../c-runtime-library/crt-library-features.md)
18+
[CRT Library Features](../c-runtime-library/crt-library-features.md)

‎docs/c-runtime-library/reference/fread.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Contents of buffer = zyxwvutsrqponmlkjihgfedcb
112112
## See also
113113

114114
[Stream I/O](../../c-runtime-library/stream-i-o.md)<br/>
115-
[Text and Binary File I/O](../../c-runtime-library/text-and-binary-mode-file-i-o.md)<br />
116-
[fopen](fopen-wfopen.md)<br />
115+
[Text and Binary File I/O](../../c-runtime-library/text-and-binary-mode-file-i-o.md)<br/>
116+
[fopen](fopen-wfopen.md)<br/>
117117
[fwrite](fwrite.md)<br/>
118118
[_read](read.md)<br/>

‎docs/c-runtime-library/reference/malloca.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Bytes to be allocated from the stack.
2929

3030
The **_malloca** routine returns a **void** pointer to the allocated space, which is guaranteed to be suitably aligned for storage of any type of object. If *size* is 0, **_malloca** allocates a zero-length item and returns a valid pointer to that item.
3131

32-
A stack overflow exception is generated if the space cannot be allocated. The stack overflow exception is not a C++ exception; it is a structured exception. Instead of using C++ exception handling, you must use [Structured Exception Handling](../../cpp/structured-exception-handling-c-cpp.md) (SEH).
32+
If *size* is greater than **_ALLOCA_S_THRESHOLD**, then **_malloca** attempts to allocate on the heap, and returns a null pointer if the space can't be allocated. If *size* is less than or equal to **_ALLOCA_S_THRESHOLD**, then **_malloca** attempts to allocate on the stack, and a stack overflow exception is generated if the space can't be allocated. The stack overflow exception isn't a C++ exception; it's a structured exception. Instead of using C++ exception handling, you must use [Structured Exception Handling](../../cpp/structured-exception-handling-c-cpp.md) (SEH) to catch this exception.
3333

3434
## Remarks
3535

‎docs/cppcx/platform-object-class.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,6 @@ Use the [typeid](../windows/typeid-cpp-component-extensions.md) operator to retu
111111
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
112112
```
113113

114-
## See Also
115-
116-
[Platform::Type Class](../cppcx/platform-type-class.md)<br/>
117-
[Platform namespace](../cppcx/platform-namespace-c-cx.md)<br/>
118-
[Type System](../cppcx/type-system-c-cx.md
119-
120114
## <a name="ctor"></a> Object::Object Constructor
121115

122116
Initializes a new instance of the Object class.
@@ -178,4 +172,6 @@ public:
178172

179173
## See Also
180174

181-
[Platform Namespace](platform-namespace-c-cx.md)
175+
[Platform Namespace](platform-namespace-c-cx.md)<br/>
176+
[Platform::Type Class](platform-type-class.md)<br/>
177+
[Type System](type-system-c-cx.md)

‎docs/data/mfc-using-database-classes-with-documents-and-views.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ You might not want to use documents and views at all. In that case, see [MFC: Us
5656

5757
## See Also
5858

59-
[MFC Database Classes(../data/mfc-database-classes-odbc-and-dao.md)
59+
[MFC Database Classes](../data/mfc-database-classes-odbc-and-dao.md)

‎docs/intrinsics/fastfail.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Internally, `__fastfail` is implemented by using several architecture-specific m
3535
|x86|int 0x29|ecx|
3636
|x64|int 0x29|rcx|
3737
|ARM|Opcode 0xDEFB|r0|
38+
|ARM64|Opcode 0xF003|x0|
3839

3940
A fast fail request is self-contained and typically requires just two instructions to execute. Once a fast fail request has been executed the kernel then takes the appropriate action. In user-mode code, there are no memory dependencies beyond the instruction pointer itself when a fast fail event is raised. This maximizes its reliability even if there is severe memory corruption.
4041

@@ -50,12 +51,12 @@ Support for the native fast fail mechanism began in Windows 8. Windows operating
5051

5152
|Intrinsic|Architecture|
5253
|---------------|------------------|
53-
|`__fastfail`|x86, x64, ARM|
54+
|`__fastfail`|x86, x64, ARM, ARM64|
5455

5556
**Header file** \<intrin.h>
5657

5758
**END Microsoft Specific**
5859

5960
## See Also
6061

61-
[Compiler Intrinsics](../intrinsics/compiler-intrinsics.md)
62+
[Compiler Intrinsics](../intrinsics/compiler-intrinsics.md)

0 commit comments

Comments
 (0)