Skip to content

Commit de74ad0

Browse files
authored
Merge pull request #6031 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents bee90ab + 857ae18 commit de74ad0

File tree

94 files changed

+563
-390
lines changed

Some content is hidden

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

94 files changed

+563
-390
lines changed

docs/assembler/masm/mmword.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: MMWORD"
32
title: "MMWORD"
4-
ms.date: "12/17/2019"
3+
description: "Learn more about: MMWORD"
4+
ms.date: 12/17/2019
55
f1_keywords: ["MMWORD"]
66
helpviewer_keywords: ["MMWORD directive"]
7-
ms.assetid: b4c5a104-9078-4fb4-afc3-d1e63abe562a
87
---
98
# MMWORD
109

@@ -32,6 +31,6 @@ While both instructions work on 64-bit operands, **QWORD** is the type for 64-bi
3231
movq mm0, mmword ptr [ebx]
3332
```
3433

35-
## See Also
34+
## See also
3635

3736
[MASM BNF Grammar](masm-bnf-grammar.md)

docs/assembler/masm/xmmword.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: XMMWORD"
32
title: "XMMWORD"
4-
ms.date: "12/17/2019"
3+
description: "Learn more about: XMMWORD"
4+
ms.date: 12/17/2019
55
f1_keywords: ["XMMWORD"]
66
helpviewer_keywords: ["XMMWORD directive"]
7-
ms.assetid: 18026d32-5cab-403e-ad7e-382fb41aa9b8
87
---
98
# XMMWORD
109

@@ -24,6 +23,6 @@ Used for 128-bit multimedia operands with MMX and SSE (XMM) instructions.
2423
movdqa xmm0, xmmword ptr [ebx]
2524
```
2625

27-
## See Also
26+
## See also
2827

2928
[MASM BNF Grammar](masm-bnf-grammar.md)

docs/build/reference/profile-performance-tools-profiler.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: /PROFILE (Performance Tools Profiler)"
32
title: "/PROFILE (Performance Tools Profiler)"
3+
description: "Learn more about: /PROFILE (Performance Tools Profiler)"
44
ms.date: 10/13/2021
55
f1_keywords: ["VC.Project.VCLinkerTool.Profile"]
66
helpviewer_keywords: ["-PROFILE linker option", "/PROFILE linker option"]
@@ -57,7 +57,7 @@ Because a **CMake** project doesn't have the usual **Property Pages** support, t
5757

5858
1. Rebuild your solution.
5959

60-
## See Also
60+
## See also
6161

6262
[MSVC linker reference](linking.md)\
6363
[MSVC linker options](linker-options.md)

docs/c-runtime-library/crt-debugging-techniques.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ When you debug a program that uses the C run-time library, these debugging techn
1818

1919
The C runtime (CRT) library provides extensive debugging support. To use one of the CRT debug libraries, you must link with [`/DEBUG`](/cpp/build/reference/debug-generate-debug-info) and compile with [`/MDd`, `/MTd`, or `/LDd`](../build/reference/md-mt-ld-use-run-time-library.md).
2020

21-
The main definitions and macros for CRT debugging can be found in the`<crtdbg.h>` header file.
21+
The main definitions and macros for CRT debugging can be found in the `<crtdbg.h>` header file.
2222

2323
The functions in the CRT debug libraries are compiled with debug information ([/Z7, /Zd, /Zi, /ZI (Debug Information Format)](../build/reference/z7-zi-zi-debug-information-format.md)) and without optimization. Some functions contain assertions to verify parameters that are passed to them, and source code is provided. With this source code, you can step into CRT functions to confirm that the functions are working as you expect and check for bad parameters or memory states. (Some CRT technology is proprietary and doesn't provide source code for exception handling, floating point, and a few other routines.)
2424

2525
For more information on the various run-time libraries you can use, see [C Run-Time Libraries](./crt-library-features.md).
2626

2727
## Macros for reporting
2828

29-
For debugging, you can use the `_RPTn` and `_RPTFn` macros, defined in`<crtdbg.h>`, to replace the use of `printf` statements. You don't need to enclose them in `#ifdef` directives, because they automatically disappear in your release build when `_DEBUG` isn't defined.
29+
For debugging, you can use the `_RPTn` and `_RPTFn` macros, defined in `<crtdbg.h>`, to replace the use of `printf` statements. You don't need to enclose them in `#ifdef` directives, because they automatically disappear in your release build when `_DEBUG` isn't defined.
3030

3131
| Macro | Description |
3232
|---|---|
@@ -81,7 +81,7 @@ You can write several kinds of custom debug hook functions that allow you to ins
8181
8282
### Client block hook functions
8383
84-
If you want to validate or report the contents of the data stored in `_CLIENT_BLOCK` blocks, you can write a function specifically for this purpose. The function that you write must have a prototype similar to the following, as defined in`<crtdbg.h>`:
84+
If you want to validate or report the contents of the data stored in `_CLIENT_BLOCK` blocks, you can write a function specifically for this purpose. The function that you write must have a prototype similar to the following, as defined in `<crtdbg.h>`:
8585
8686
```cpp
8787
void YourClientDump(void *, size_t)
@@ -91,7 +91,7 @@ In other words, your hook function should accept a `void` pointer to the beginni
9191

9292
Once you've installed your hook function using [_CrtSetDumpClient](./reference/crtsetdumpclient.md), it will be called every time a `_CLIENT_BLOCK` block is dumped. You can then use [_CrtReportBlockType](./reference/crtreportblocktype.md) to get information on the type or subtype of dumped blocks.
9393

94-
The pointer to your function that you pass to `_CrtSetDumpClient` is of type `_CRT_DUMP_CLIENT`, as defined in`<crtdbg.h>`:
94+
The pointer to your function that you pass to `_CrtSetDumpClient` is of type `_CRT_DUMP_CLIENT`, as defined in `<crtdbg.h>`:
9595

9696
```cpp
9797
typedef void (__cdecl *_CRT_DUMP_CLIENT)
@@ -113,7 +113,7 @@ int YourAllocHook(int nAllocType, void *pvData,
113113
const unsigned char * szFileName, int nLine )
114114
```
115115

116-
The pointer that you pass to [`_CrtSetAllocHook`](./reference/crtsetallochook.md) is of type `_CRT_ALLOC_HOOK`, as defined in`<crtdbg.h>`:
116+
The pointer that you pass to [`_CrtSetAllocHook`](./reference/crtsetallochook.md) is of type `_CRT_ALLOC_HOOK`, as defined in `<crtdbg.h>`:
117117

118118
```cpp
119119
typedef int (__cdecl * _CRT_ALLOC_HOOK)

docs/code-quality/c28112.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ InterlockedDecrement(&inter_var);
3535
InterlockedIncrement(&inter_var);
3636
```
3737

38-
## See Also
38+
## See also
3939

4040
[InterlockedIncrement function (wdm.h)](/windows-hardware/drivers/ddi/wdm/nf-wdm-interlockedincrement)\
4141
[InterlockedDecrement function (wdm.h)](/windows-hardware/drivers/ddi/wdm/nf-wdm-interlockeddecrement)

docs/code-quality/c6504.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: Warning C6504"
32
title: Warning C6504
3+
description: "Learn more about: Warning C6504"
44
ms.date: 10/03/2022
55
f1_keywords: ["C6504", "NULL_ON_NON_POINTER", "__WARNING_NULL_ON_NON_POINTER"]
66
helpviewer_keywords: ["C6504"]
7-
ms.assetid: 6baeed46-e73d-4974-af16-7487c55b3473
87
---
98
# Warning C6504
109

@@ -60,6 +59,6 @@ void g(Point& pt)
6059
}
6160
```
6261

63-
## See Also
62+
## See also
6463

6564
[Annotation Properties](using-sal-annotations-to-reduce-c-cpp-code-defects.md)

docs/code-quality/using-sal-annotations-to-reduce-c-cpp-code-defects.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
---
2-
description: "Learn more about: Using SAL Annotations to Reduce C/C++ Code Defects"
32
title: Using SAL Annotations to Reduce C/C++ Code Defects
3+
description: "Learn more about: Using SAL Annotations to Reduce C/C++ Code Defects"
44
ms.date: 11/04/2016
55
ms.topic: "concept-article"
66
helpviewer_keywords:
77
- "annotations"
88
- "SAL annotations"
99
- "code analysis, annotation"
10-
ms.assetid: a16e47d0-6f3e-4ed6-8883-459b2874e9a4
1110
---
1211
# Using SAL Annotations to Reduce C/C++ Code Defects
1312

@@ -47,6 +46,6 @@ The articles in this section of the documentation discuss aspects of SAL, provid
4746

4847
Provides examples that show how to use SAL annotations. Also explains common pitfalls.
4948

50-
## See Also
49+
## See also
5150

5251
[SAL 2.0 Annotations for Windows Drivers](/windows-hardware/drivers/devtest/sal-2-annotations-for-windows-drivers)

docs/cpp/import-export-module.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: "module, import, export"
3+
description: Use import and export declarations to access and to publish types and functions defined in the specified module.
34
ms.date: 02/13/2025
45
f1_keywords: ["module_cpp", "import_cpp", "export_cpp"]
56
helpviewer_keywords: ["modules [C++]", "modules [C++], import", "modules [C++], export"]
6-
description: Use import and export declarations to access and to publish types and functions defined in the specified module.
77
---
88
# `module`, `import`, `export`
99

@@ -109,7 +109,7 @@ import // Always an identifier, never a keyword
109109
110110
**End Microsoft Specific**
111111
112-
## See Also
112+
## See also
113113
114114
[Overview of modules in C++](modules-cpp.md)\
115115
[Import the C++ standard library using modules](tutorial-import-stl-named-module.md)

docs/error-messages/compiler-errors-1/compiler-error-c2041.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
---
2-
description: "Learn more about: Compiler Error C2041"
32
title: "Compiler Error C2041"
4-
ms.date: "11/04/2016"
3+
description: "Learn more about: Compiler Error C2041"
4+
ms.date: 11/04/2016
55
f1_keywords: ["C2041"]
66
helpviewer_keywords: ["C2041"]
7-
ms.assetid: c9a33bb1-f9cf-47d6-bd21-7d867a8c37d5
87
---
98
# Compiler Error C2041
109

11-
illegal digit 'character' for base 'number'
10+
> illegal digit 'character' for base 'number'
11+
12+
## Remarks
1213

1314
The specified character is not a valid digit for the base (such as octal or hex).
1415

15-
The following sample generates C2041:
16+
## Example
17+
18+
The following example generates C2041:
1619

1720
```cpp
1821
// C2041.cpp

docs/error-messages/compiler-errors-1/compiler-error-c2042.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
---
2-
description: "Learn more about: Compiler Error C2042"
32
title: "Compiler Error C2042"
4-
ms.date: "11/04/2016"
3+
description: "Learn more about: Compiler Error C2042"
4+
ms.date: 11/04/2016
55
f1_keywords: ["C2042"]
66
helpviewer_keywords: ["C2042"]
7-
ms.assetid: e111788f-41ce-405a-9824-a4c1c26059e6
87
---
98
# Compiler Error C2042
109

11-
signed/unsigned keywords mutually exclusive
10+
> signed/unsigned keywords mutually exclusive
11+
12+
## Remarks
1213

1314
The keywords **`signed`** and **`unsigned`** are used in a single declaration.
1415

15-
The following sample generates C2042:
16+
## Example
17+
18+
The following example generates C2042:
1619

1720
```cpp
1821
// C2042.cpp

0 commit comments

Comments
 (0)