Skip to content

Commit 58b8900

Browse files
authored
Merge pull request #5896 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents 5149eed + ff77ead commit 58b8900

14 files changed

+37
-74
lines changed

docs/build/reference/idlout-name-midl-output-files.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
description: "Learn more about: /IDLOUT (Name MIDL Output Files)"
32
title: "/IDLOUT (Name MIDL Output Files)"
3+
description: "Learn more about: /IDLOUT (Name MIDL Output Files)"
44
ms.date: 03/27/2025
55
f1_keywords: ["/idlout", "VC.Project.VCLinkerTool.MergedIDLBaseFileName"]
66
helpviewer_keywords: ["MIDL, output file names", ".idl files, path", "MIDL", "/IDLOUT linker option", "IDL files, path", "-IDLOUT linker option", "IDLOUT linker option"]
@@ -21,7 +21,7 @@ Specifies the name of the `.idl` file created by the MIDL compiler. No file exte
2121

2222
## Remarks
2323

24-
The `/IDLOUT` option specifies the name and extension of the `.idl `file.
24+
The `/IDLOUT` option specifies the name and extension of the `.idl` file.
2525

2626
The MIDL compiler is called by the MSVC linker when linking projects that have the [`module`](../../windows/attributes/module-cpp.md) attribute.
2727

docs/build/reference/keyfile-specify-key-or-key-pair-to-sign-an-assembly.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
description: "Learn more about: /KEYFILE (Specify Key or Key Pair to Sign an Assembly)"
32
title: "/KEYFILE (Specify Key or Key Pair to Sign an Assembly)"
3+
description: "Learn more about: /KEYFILE (Specify Key or Key Pair to Sign an Assembly)"
44
ms.date: 03/24/2025
55
f1_keywords: ["/keyfile", "VC.Project.VCLinkerTool.KeyFile"]
66
helpviewer_keywords: ["/KEYFILE linker option", "-KEYFILE linker option", "KEYFILE linker option"]
77
---
8-
# /KEYFILE (Specify Key or Key Pair to Sign an Assembly)
8+
# `/KEYFILE` (Specify Key or Key Pair to Sign an Assembly)
99

1010
```
1111
/KEYFILE:filename
@@ -20,7 +20,7 @@ File that contains the key. Place the string in double quotation marks (" ") if
2020

2121
The linker inserts the public key into the assembly manifest and then signs the final assembly with the private key. To generate a key file, type [`sn -k`](/dotnet/framework/tools/sn-exe-strong-name-tool) *filename* at the command line. A signed assembly is said to have a strong name.
2222

23-
If you compile with [`/LN`](ln-create-msil-module.md), the name of the key file is held in the module and incorporated into the assembly that is created when you compile an assembly that includes an explicit reference to the module, via [`#using`](../../preprocessor/hash-using-directive-cpp.md), or when linking with `[/ASSEMBLYMODULE`](assemblymodule-add-a-msil-module-to-the-assembly.md).
23+
If you compile with [`/LN`](ln-create-msil-module.md), the name of the key file is held in the module and incorporated into the assembly that is created when you compile an assembly that includes an explicit reference to the module, via [`#using`](../../preprocessor/hash-using-directive-cpp.md), or when linking with [`/ASSEMBLYMODULE`](assemblymodule-add-a-msil-module-to-the-assembly.md).
2424

2525
You can also pass your encryption information to the linker with [`/KEYCONTAINER`](keycontainer-specify-a-key-container-to-sign-an-assembly.md). Use [`/DELAYSIGN`](delaysign-partially-sign-an-assembly.md) if you want a partially signed assembly. For more information on signing an assembly, see [Strong Name Assemblies (Assembly Signing) (C++/CLI)](../../dotnet/strong-name-assemblies-assembly-signing-cpp-cli.md) and [Creating and Using Strong-Named Assemblies](/dotnet/framework/app-domains/create-and-use-strong-named-assemblies).
2626

@@ -30,7 +30,7 @@ A key file might contain only the public key.
3030

3131
Other linker options that affect assembly generation are:
3232

33-
- [/`ASSEMBLYDEBUG`](assemblydebug-add-debuggableattribute.md)
33+
- [`/ASSEMBLYDEBUG`](assemblydebug-add-debuggableattribute.md)
3434
- [`/ASSEMBLYLINKRESOURCE`](assemblylinkresource-link-to-dotnet-framework-resource.md)
3535
- [`/ASSEMBLYMODULE`](assemblymodule-add-a-msil-module-to-the-assembly.md)
3636
- [`/ASSEMBLYRESOURCE`](assemblyresource-embed-a-managed-resource.md)

docs/build/reference/pdb-use-program-database.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
description: "Learn more about: /PDB (Use Program Database)"
32
title: "/PDB (Use Program Database)"
3+
description: "Learn more about: /PDB (Use Program Database)"
44
ms.date: 03/24/2025
55
f1_keywords: ["/pdb", "VC.Project.VCLinkerTool.ProgramDatabaseFile"]
66
helpviewer_keywords: ["-PDB linker option", "/PDB linker option", "PDB linker option", "PDB files, creating", ".pdb files, creating"]
@@ -22,7 +22,7 @@ A user-specified name for the program database (PDB) that the linker creates. It
2222

2323
By default, when [`/DEBUG`](debug-generate-debug-info.md) is specified, the linker creates a program database (PDB) which holds debugging information. The default file name for the PDB has the base name of the program and the extension .pdb.
2424

25-
Use `/PDB:`*`filename`* to specify the name of the PDB file. If `/DEBUG `is not specified, the `/PDB` option is ignored.
25+
Use `/PDB:`*`filename`* to specify the name of the PDB file. If `/DEBUG` is not specified, the `/PDB` option is ignored.
2626

2727
A PDB file can be up to 2GB in size.
2828

docs/build/reference/qspectre.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
description: "Learn more about: /Qspectre"
32
title: "/Qspectre"
3+
description: "Learn more about: /Qspectre"
44
ms.date: 07/02/2021
55
f1_keywords: ["VC.Project.VCCLCompilerTool.SpectreMitigation"]
66
helpviewer_keywords: ["/Qspectre"]
77
---
8-
# /Qspectre
8+
# `/Qspectre`
99

1010
Specifies compiler generation of instructions to mitigate certain Spectre variant 1 security vulnerabilities.
1111

@@ -38,7 +38,7 @@ If your code operates on data that crosses a trust boundary, then we recommend y
3838

3939
The **`/Qspectre`** option is available starting in Visual Studio 2017 version 15.5.5, and in all updates to Microsoft C/C++ compilers (MSVC) made on or after January 23, 2018. Use the Visual Studio Installer to update the compiler, and to install the Spectre-mitigated libraries as individual components. The **`/Qspectre`** option is also available in Visual Studio 2015 Update 3 through a patch. For more information, see [KB 4338871](https://support.microsoft.com/help/4338871).
4040

41-
All versions of Visual Studio 2017 version 15.5, and all Previews of Visual Studio 2017 version 15.6. include an undocumented option, **/`d2guardspecload`**. It's equivalent to the initial behavior of **`/Qspectre`**. You can use **`/d2guardspecload`** to apply the same mitigations to your code in these versions of the compiler. We recommend you update your build to use **`/Qspectre`** in compilers that support the option. The **`/Qspectre`** option may also support new mitigations in later versions of the compiler.
41+
All versions of Visual Studio 2017 version 15.5, and all Previews of Visual Studio 2017 version 15.6. include an undocumented option, **`/d2guardspecload`**. It's equivalent to the initial behavior of **`/Qspectre`**. You can use **`/d2guardspecload`** to apply the same mitigations to your code in these versions of the compiler. We recommend you update your build to use **`/Qspectre`** in compilers that support the option. The **`/Qspectre`** option may also support new mitigations in later versions of the compiler.
4242

4343
### Effect
4444

docs/build/reference/winmdfile-specify-winmd-file.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
description: "Learn more about: /WINMDFILE (Specify winmd File)"
32
title: "/WINMDFILE (Specify winmd File)"
3+
description: "Learn more about: /WINMDFILE (Specify winmd File)"
44
ms.date: 03/27/2025
55
f1_keywords: ["VC.Project.VCLinkerTool.GenerateWindowsMetadataFile"]
66
---
@@ -31,6 +31,6 @@ Use the value that is specified in `filename` to override the default `.winmd` f
3131

3232
## See also
3333

34-
[`/WINMD `(Generate Windows Metadata)](winmd-generate-windows-metadata.md)\
34+
[`/WINMD` (Generate Windows Metadata)](winmd-generate-windows-metadata.md)\
3535
[MSVC linker reference](linking.md)\
3636
[MSVC Linker Options](linker-options.md)

docs/build/reference/zc-ternary.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
description: "Learn more about: `/Zc:ternary` (Enforce conditional operator rules)"
32
title: "/Zc:ternary (Enforce conditional operator rules)"
4-
ms.date: "09/12/2019"
3+
description: "Learn more about: `/Zc:ternary` (Enforce conditional operator rules)"
4+
ms.date: 09/12/2019
55
f1_keywords: ["/Zc:ternary"]
66
helpviewer_keywords: ["/Zc:ternary", "Zc:ternary", "-Zc:ternary"]
77
---
@@ -23,7 +23,7 @@ The **`/Zc:ternary`** option is off by default in Visual Studio 2017. Use **`/Zc
2323

2424
### Examples
2525

26-
This sample shows how a class that provides both non-explicit initialization from a type, and conversion to a type, can lead to ambiguous conversions. This code is accepted by the compiler by default, but rejected when **/`Zc:ternary`** or **`/permissive-`** is specified.
26+
This sample shows how a class that provides both non-explicit initialization from a type, and conversion to a type, can lead to ambiguous conversions. This code is accepted by the compiler by default, but rejected when **`/Zc:ternary`** or **`/permissive-`** is specified.
2727

2828
```cpp
2929
// zcternary1.cpp

docs/build/understanding-manifest-generation-for-c-cpp-programs.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
2-
description: "Learn more about: Understanding manifest generation for C/C++ programs"
32
title: "Understanding manifest generation for C/C++ programs"
3+
description: "Learn more about: Understanding manifest generation for C/C++ programs"
44
ms.date: 06/10/2022
55
helpviewer_keywords: ["manifests [C++]"]
6-
ms.assetid: a1f24221-5b09-4824-be48-92eae5644b53
76
---
87
# Understanding manifest generation for C/C++ programs
98

@@ -181,7 +180,7 @@ clean :
181180
#^^^^^^^^^^^^^^^^^^^^^^^^^ Change #4. (Add full path if necessary.)
182181
```
183182

184-
The makefiles now include two files that do the real work,*` makefile.inc`* and *`makefile.target.inc`*.
183+
The makefiles now include two files that do the real work, *`makefile.inc`* and *`makefile.target.inc`*.
185184

186185
Create *`makefile.inc`* and copy the following content into it:
187186

docs/parallel/concrt/reference/concurrent-priority-queue-class.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: concurrent_priority_queue Class"
32
title: "concurrent_priority_queue Class"
4-
ms.date: "11/04/2016"
3+
description: "Learn more about: concurrent_priority_queue Class"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_priority_queue", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::concurrent_priority_queue", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::clear", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::empty", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::get_allocator", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::push", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::size", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::swap", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::try_pop"]
66
helpviewer_keywords: ["concurrent_priority_queue class"]
7-
ms.assetid: 3e740381-0f4e-41fc-8b66-ad0bb55f17a3
87
---
98
# concurrent_priority_queue Class
109

@@ -14,10 +13,9 @@ The `concurrent_priority_queue` class is a container that allows multiple thread
1413

1514
```cpp
1615
template <typename T,
17-
typename _Compare= std::less<T>,
18-
typename _Ax = std::allocator<T>
19-
>,
20-
typename _Ax = std::allocator<T>> class concurrent_priority_queue;
16+
typename _Compare = std::less<T>,
17+
typename _Ax = std::allocator<T>>
18+
class concurrent_priority_queue;
2119
```
2220

2321
### Parameters

docs/parallel/concrt/reference/concurrent-unordered-map-class.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "concurrent_unordered_map Class"
33
description: "Learn more about: concurrent_unordered_map Class"
4-
ms.date: "11/04/2016"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_unordered_map", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::concurrent_unordered_map", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::at", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::hash_function", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::insert", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::key_eq", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::swap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::unsafe_erase"]
66
helpviewer_keywords: ["concurrent_unordered_map class"]
77
---
@@ -16,18 +16,8 @@ template <typename K,
1616
typename _Element_type,
1717
typename _Hasher = std::hash<K>,
1818
typename key_equality = std::equal_to<K>,
19-
typename _Allocator_type = std::allocator<std::pair<const K,
20-
_Element_type>>
21-
>,
22-
typename key_equality = std::equal_to<K>,
23-
typename _Allocator_type = std::allocator<std::pair<const K,
24-
_Element_type>>> class concurrent_unordered_map : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K,
25-
_Element_type,
26-
details::_Hash_compare<K,
27-
_Hasher,
28-
key_equality>,
29-
_Allocator_type,
30-
false>>;
19+
typename _Allocator_type = std::allocator<std::pair<const K, _Element_type>>>
20+
class concurrent_unordered_map : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K, _Element_type, details::_Hash_compare<K, _Hasher, key_equality>, _Allocator_type, false>>;
3121
```
3222
3323
### Parameters

docs/parallel/concrt/reference/concurrent-unordered-multimap-class.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "concurrent_unordered_multimap Class"
33
description: "Learn more about: concurrent_unordered_multimap Class"
4-
ms.date: "11/04/2016"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_unordered_multimap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::concurrent_unordered_multimap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::hash_function", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::insert", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::key_eq", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::swap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::unsafe_erase"]
66
helpviewer_keywords: ["concurrent_unordered_multimap class"]
77
---
@@ -16,18 +16,8 @@ template <typename K,
1616
typename _Element_type,
1717
typename _Hasher = std::hash<K>,
1818
typename key_equality = std::equal_to<K>,
19-
typename _Allocator_type = std::allocator<std::pair<const K,
20-
_Element_type>>
21-
>,
22-
typename key_equality = std::equal_to<K>,
23-
typename _Allocator_type = std::allocator<std::pair<const K,
24-
_Element_type>>> class concurrent_unordered_multimap : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K,
25-
_Element_type,
26-
details::_Hash_compare<K,
27-
_Hasher,
28-
key_equality>,
29-
_Allocator_type,
30-
true>>;
19+
typename _Allocator_type = std::allocator<std::pair<const K, _Element_type>>>
20+
class concurrent_unordered_multimap : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K, _Element_type, details::_Hash_compare<K, _Hasher, key_equality>, _Allocator_type, true>>;
3121
```
3222
3323
### Parameters

0 commit comments

Comments
 (0)