Skip to content

Commit 6c04d97

Browse files
authored
Merge pull request #5138 from MicrosoftDocs/FromPrivateLiveToMaster
Resolve syncing conflicts from FromPrivateLiveToMaster to main
2 parents a4c6a54 + 09d8747 commit 6c04d97

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

docs/assembler/masm/processor-manufacturer-programming-manuals.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
---
22
description: "Learn more about: Processor manufacturer programming manuals"
33
title: "Processor manufacturer programming manuals"
4-
ms.date: "05/28/2020"
5-
ms.assetid: 61844163-de2f-419a-808e-04de39dfdddf
4+
ms.date: "12/6/2024"
65
---
76
# Processor manufacturer programming manuals
87

9-
This article provides links to websites that may contain programming info about processors that aren't made, sold, or supported by Microsoft. Microsoft doesn't control the websites or their content.
8+
This article provides links to websites that may contain programming info about processors that Microsoft doesn't make, sell, or support. Microsoft doesn't control the websites or their content.
109

1110
## Processor manufacturer websites
1211

1312
- [AMD Documentation Hub](https://www.amd.com/en/search/documentation/hub.html)
14-
1513
- [ARM Architecture Reference Manual](https://developer.arm.com/documentation/ddi0487/latest/)
16-
1714
- [Intel 64 and IA-32 Architectures Software Developer Manuals](https://www.intel.com/content/www/us/en/developer/articles/technical/intel-sdm.html)
15+
- [Introducing Intel® Advanced Performance Extensions (Intel APX)](https://www.intel.com/content/www/us/en/developer/articles/technical/advanced-performance-extensions-apx.html)
1816

1917
## Remarks
2018

docs/standard-library/thread-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ An existing `thread` object.
228228

229229
The first constructor constructs an object that's not associated with a thread of execution. The value returned by `get_id` for the constructed object is `thread::id()`.
230230

231-
The second constructor constructs an object that's associated with a new thread of execution. It executes the pseudo-function `INVOKE` defined in [`<functional>`](../standard-library/functional.md). If not enough resources are available to start a new thread, the function throws a [`system_error`](../standard-library/system-error-class.md) object that has an error code of `resource_unavailable_try_again`. If the call to *`F`* terminates with an uncaught exception, [`terminate`](../standard-library/exception-functions.md#terminate) is called.
231+
The second constructor constructs an object that's associated with a new thread of execution. It executes the pseudo-function `INVOKE` defined in [`<functional>`](../standard-library/functional.md). If not enough resources are available to start a new thread, the function throws a [`system_error`](../standard-library/system-error-class.md) object that has an error code of `resource_unavailable_try_again`. If the call to *`F`* terminates with an uncaught exception, [`terminate`](../standard-library/exception-functions.md#terminate) is called. The call to *`F`* must not cause the thread to exit prematurely, such as by calling `ExitThread` or `_endthreadex`.
232232

233233
The third constructor constructs an object that's associated with the thread that's associated with `Other`. `Other` is then set to a default-constructed state.
234234

0 commit comments

Comments
 (0)