Skip to content

Commit 9cc946d

Browse files
authored
Merge pull request #5938 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents af76ba0 + a5d7cd7 commit 9cc946d

21 files changed

+92
-104
lines changed

docs/build/clang-support-msbuild.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ To configure a Visual Studio project to use Clang, right-click on the project no
5757
The project properties page is open to the Configuration Properties > General page. The Platform Toolset dropdown is selected, on which LLVM (clang-cl) is selected.
5858
:::image-end:::
5959

60-
If you're using the Clang tools that are bundled with Visual Studio, no extra steps are required. For Windows projects, Visual Studio by default invokes Clang in [clang-cl](https://llvm.org/devmtg/2014-04/PDFs/Talks/clang-cl.pdf) mode. It links with the Microsoft implementation of the Standard Library. By default, **clang-cl.exe** is located in `*%VCINSTALLDIR%\Tools\Llvm\bin\*` and `*%VCINSTALLDIR%\Tools\Llvm\x64\bin\*`.
60+
If you're using the Clang tools that are bundled with Visual Studio, no extra steps are required. For Windows projects, Visual Studio by default invokes Clang in [clang-cl](https://llvm.org/devmtg/2014-04/PDFs/Talks/clang-cl.pdf) mode. It links with the Microsoft implementation of the Standard Library. By default, **clang-cl.exe** is located in *`%VCINSTALLDIR%\Tools\Llvm\bin\`* and *`%VCINSTALLDIR%\Tools\Llvm\x64\bin\`*.
6161

6262
If you're using a custom Clang installation, you can change the value of the `LLVMInstallDir` property. For more information, see [Set a custom LLVM location](#custom_llvm_location).
6363

docs/build/launch-vs-schema-reference-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ To create the file, right-click on an executable file in **Solution Explorer** a
5555
| `debugServerArgs` | string | Optional debug server args. Defaults to null. |
5656
| `filterStderr` | boolean | Search stderr stream for server-started pattern and log stderr to debug output. Defaults to **`false`**. |
5757
| `coreDumpPath` | string | Optional full path to a core dump file for the specified program. Defaults to null. |
58-
| externalConsole | boolean | If true, a console is launched for the debuggee. If **`false`**, no console is launched. The default for this setting is **`false`**. This option is ignored in some cases for technical reasons. |
58+
| `externalConsole` | boolean | If true, a console is launched for the debuggee. If **`false`**, no console is launched. The default for this setting is **`false`**. This option is ignored in some cases for technical reasons. |
5959
| `pipeTransport` | string | When present, this value tells the debugger to connect to a remote computer using another executable as a pipe that will relay standard input/output between Visual Studio and the MI-enabled debugger (such as gdb). Allowed values: one or more [Pipe Transport Options](#pipe_transport_options). |
6060

6161
## debugInfo macros

docs/build/reference/arch-arm64.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Specifies the Armv9-A architecture, where **`x`** is a required extension value
2525
You can specify an ARM64 extension from Armv8.0-A through Armv8.9-A, and Armv9.0-A through Armv9.4-A. Optionally, enable one or more architecture features by appending a feature argument to the option<sup>3</sup>. For example, to target Armv8.0-A and enable feature `FEAT_LSE`, append feature argument **`lse`** so that the option becomes **`/arch:armv8.0+lse`**. For more information about available features and their requirements, see [`/feature` (ARM64)](feature-arm64.md)<sup>3</sup>.
2626

2727
> [!NOTE]
28-
> Depending on your version of Visual Studio, the compiler may not yet generate instructions from all feature sets required by the extension level you specify. For example, **`/arch:armv8.1`** allows the `*Interlocked*` intrinsic functions to use the appropriate atomic instruction introduced with the Armv8.1-A extension feature `FEAT_LSE`, but compiler support requires Visual Studio 2022 version 17.2 or later.
28+
> Depending on your version of Visual Studio, the compiler may not yet generate instructions from all feature sets required by the extension level you specify. For example, **`/arch:armv8.1`** allows the *`Interlocked`* intrinsic functions to use the appropriate atomic instruction introduced with the Armv8.1-A extension feature `FEAT_LSE`, but compiler support requires Visual Studio 2022 version 17.2 or later.
2929
3030
The `_M_ARM64` macro is defined by default when compiling for an ARM64 target. For more information, see [Predefined macros](../../preprocessor/predefined-macros.md).
3131

docs/build/reference/ifc-map.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This switch tells the compiler where to find the IFC reference map file, which m
1717
1818
## Remarks
1919

20-
The `*filename*` argument specifies the IFC reference map file. It can be relative to the compiler's working directory, or an absolute path.
20+
The *`filename`* argument specifies the IFC reference map file. It can be relative to the compiler's working directory, or an absolute path.
2121

2222
You can provide multiple `/ifcMap` arguments to the compiler.
2323

docs/build/walkthrough-import-stl-header-units.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ Follow these steps to create a project that includes two STL libraries: `<iostre
182182
1. Replace the contents of the source file as follows:
183183
184184
```cpp
185-
#include <iostream>;
186-
#include <vector>;
185+
#include <iostream>
186+
#include <vector>
187187
188188
int main()
189189
{

docs/code-quality/c26434.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ description: "Microsoft C++ Code Analysis warning C26434 for the C++ Core Guidel
44
ms.date: 08/21/2020
55
f1_keywords: ["C26434", "DONT_HIDE_METHODS"]
66
helpviewer_keywords: ["C26434"]
7-
ms.assetid: 7f66477f-da66-444a-a6e3-44513d7d7e31
87
---
98
# Warning C26434
109

@@ -44,5 +43,4 @@ struct Derived : Base
4443
void not_virtual() noexcept {} // C26434, hides a non-virtual function
4544
virtual void not_virtual(int i) noexcept {} // C26434, and parameters ignored
4645
};
47-
4846
```

docs/code-quality/c26483.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: Warning C26483
3+
description: CppCoreCheck rule C26483 that enforces C++ Core Guidelines Bounds.2
34
ms.date: 03/22/2018
45
f1_keywords: ["C26483", "STATIC_INDEX_OUT_OF_RANGE"]
56
helpviewer_keywords: ["C26483"]
6-
description: CppCoreCheck rule C26483 that enforces C++ Core Guidelines Bounds.2
77
---
88
# Warning C26483
99

@@ -24,5 +24,4 @@ void function()
2424
int arr2[] { 1, 2, 3 };
2525
arr2[3] = 4; // C26483, 3 is outside the bounds of the array
2626
}
27-
2827
```

docs/code-quality/c28159.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
2-
description: "Learn more about: Warning C28159"
32
title: Warning C28159
3+
description: "Learn more about: Warning C28159"
44
ms.date: 09/08/2022
55
f1_keywords: ["C28159", "USE_OTHER_FUNCTION", "__WARNING_USE_OTHER_FUNCTION"]
66
helpviewer_keywords: ["C28159"]
7-
ms.assetid: fab6cd58-0985-4ef6-89a2-64ed04297437
87
---
98
# Warning C28159
109

11-
> Consider using `*function_name_1*` instead of `*function_name_2*`. Reason: *reason*
10+
> Consider using *`function_name_1`* instead of *`function_name_2`*. Reason: *reason*
1211
1312
This warning occurs when you use a function that is semantically equivalent to an alternative, preferred function call.
1413

docs/code-quality/c6331.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
2-
description: "Learn more about: Warning C6331"
32
title: Warning C6331
3+
description: "Learn more about: Warning C6331"
44
ms.date: 10/03/2022
55
f1_keywords: ["C6331", "VirtualFreeInvalidParam1", "__WARNING_VIRTUALFREEINVALIDPARAM1"]
66
helpviewer_keywords: ["C6331"]
7-
ms.assetid: cb1ecc2c-29a5-4c57-acf2-0954a4c047b1
87
---
98
# Warning C6331
109

11-
> Invalid parameter: passing MEM_RELEASE and MEM_DECOMMIT in conjunction to `*function*` is not allowed. This results in the failure of this call
10+
> Invalid parameter: passing MEM_RELEASE and MEM_DECOMMIT in conjunction to *`function`* is not allowed. This results in the failure of this call
1211
1312
This message indicates that an invalid parameter is passed to `VirtualFree` or `VirtualFreeEx`. `VirtualFree` and `VirtualFreeEx` both reject the flags (`MEM_RELEASE | MEM_DECOMMIT`) in combination. Therefore, the values `MEM_DECOMMIT` and `MEM_RELEASE` may not be used together in the same call.
1413

docs/code-quality/c6383.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
2-
description: "Learn more about: Warning C6383"
32
title: Warning C6383
3+
description: "Learn more about: Warning C6383"
44
ms.date: 09/07/2022
55
f1_keywords: ["C6383", "ELEMENTS_TO_BYTES", "__WARNING_ELEMENTS_TO_BYTES"]
66
helpviewer_keywords: ["C6383"]
7-
ms.assetid: f5ff7938-0fbe-4b71-b98f-098fe887799d
87
---
98
# Warning C6383
109

11-
> Buffer overrun due to conversion of an element count into a byte count: an element count is expected for parameter `*parameter_name*` in call to `*function_name*`
10+
> Buffer overrun due to conversion of an element count into a byte count: an element count is expected for parameter *`parameter_name`* in call to *`function_name`*
1211
1312
This warning indicates that a non-constant byte count is being passed when an element count is instead required.
1413

0 commit comments

Comments
 (0)