Skip to content

Commit 9deeb0b

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

20 files changed

+117
-86
lines changed

docs/assembler/masm/dot-code.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: .CODE"
32
title: ".CODE"
3+
description: "Learn more about: .CODE"
44
ms.date: "12/17/2019"
55
f1_keywords: [".CODE"]
66
helpviewer_keywords: [".CODE directive"]
7-
ms.assetid: 2b8c882c-c0d2-4fa3-8335-e6b12717a4f4
87
---
98
# .CODE
109

@@ -16,7 +15,7 @@ When using 32-bit MASM, this should be used along with [.MODEL](dot-model.md).
1615

1716
> **.CODE***name*\
1817
> *segmentItem* ⟧...\
19-
> *codesegmentnameId* **ENDS**;;⟧\
18+
> *codesegmentnameId* **ENDS**;;⟧
2019
2120
### Parameters
2221

docs/build/reference/arch-arm64.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: /arch (ARM64)"
32
title: "/arch (ARM64)"
3+
description: "Learn more about: /arch (ARM64)"
44
ms.date: 05/24/2024
55
---
66
# `/arch` (ARM64)
@@ -27,7 +27,7 @@ You can specify an ARM64 extension from Armv8.0-A through Armv8.9-A, and Armv9.0
2727
> [!NOTE]
2828
> 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
30-
The `_M_ARM64` macro is defined by default when compiling for an ARM64 target. For more information, see [Predefined macros](../../preprocessor/predefined-macros.md)\
30+
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

3232
The `__ARM_ARCH` macro is defined for `/arch:ARMv8.0` and higher. It indicates the ARM architecture extension level that the compiler is targeting. For more information, see [Predefined macros](../../preprocessor/predefined-macros.md).
3333

docs/build/reference/genprofile-fastgenprofile-generate-profiling-instrumented-build.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: /GENPROFILE, /FASTGENPROFILE (Generate Profiling Instrumented Build)"
32
title: "/GENPROFILE, /FASTGENPROFILE (Generate Profiling Instrumented Build)"
3+
description: "Learn more about: /GENPROFILE, /FASTGENPROFILE (Generate Profiling Instrumented Build)"
44
ms.date: 04/14/2021
55
f1_keywords: ["GENPROFILE", "FASTGENPROFILE", "/GENPROFILE", "/FASTGENPROFILE"]
66
helpviewer_keywords: ["GENPROFILE", "FASTGENPROFILE"]
@@ -12,7 +12,7 @@ Specifies generation of a *`.pgd`* file by the linker to support profile-guided
1212
## Syntax
1313

1414
> **`/GENPROFILE`**\[**`:`**_`profile-argument`_\[**`,`**_`profile-argument`_ ...]]\
15-
> **`/FASTGENPROFILE`**\[**`:`**_`profile-argument`_\[**`,`**_`profile-argument`_ ...]]\
15+
> **`/FASTGENPROFILE`**\[**`:`**_`profile-argument`_\[**`,`**_`profile-argument`_ ...]]
1616
1717
> *`profile-argument`*\
1818
>  { **`COUNTER32`** | **`COUNTER64`** }\

docs/build/reference/zc-tlsguards.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 the /Zc:tlsGuards (Check TLS initialization) compiler option."
32
title: "/Zc:tlsGuards (Check TLS initialization)"
3+
description: "Learn more about the /Zc:tlsGuards (Check TLS initialization) compiler option."
44
ms.date: 11/08/2022
55
f1_keywords: ["/Zc:tlsGuards"]
66
helpviewer_keywords: ["-Zc:tlsGuards compiler option (C++)", "/Zc:tlsGuards compiler option (C++)"]
@@ -29,4 +29,4 @@ The **`/Zc:tlsGuards`** option is new in Visual Studio 2019 version 16.5. This o
2929

3030
## See also
3131

32-
[`/Zc` (Conformance)](zc-conformance.md)\
32+
[`/Zc` (Conformance)](zc-conformance.md)

docs/c-runtime-library/reference/floating-point-ordering.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: isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered"
32
title: "isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered"
3+
description: "Learn more about: isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered"
44
ms.date: "01/31/2019"
55
f1_keywords: ["isgreater", "math/isgreater", "isgreaterequal", "math/isgreaterequal", "isless", "math/isless", "islessequal", "math/islessequal", "islessgreater", "math/islessgreater", "isunordered", "math/isunordered"]
66
helpviewer_keywords: ["isgreater function", "isgreaterequal function", "isless function", "islessequal function", "islessgreater function", "isunordered function"]
@@ -43,7 +43,7 @@ int isunordered(
4343
); /* C-only macro */
4444
```
4545

46-
```C++
46+
```cpp
4747
template <class FloatingType1, class FloatingType2>
4848
inline bool isgreater(
4949
FloatingType1 x,

docs/c-runtime-library/reference/log-logf-log10-log10f.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ Log base 2 of 65536.000000 is 16.000000
122122

123123
## See also
124124

125-
[Math and floating-point support](../floating-point-support.md) \
126-
[`exp`, `expf`, `expl`](exp-expf.md) \
127-
[`_matherr`](matherr.md) \
128-
[`pow`, `powf`, `powl`](pow-powf-powl.md) \
129-
[`_CIlog`](../cilog.md) \
130-
[`_CIlog10`](../cilog10.md)\
125+
[Math and floating-point support](../floating-point-support.md)\
126+
[`exp`, `expf`, `expl`](exp-expf.md)\
127+
[`_matherr`](matherr.md)\
128+
[`pow`, `powf`, `powl`](pow-powf-powl.md)\
129+
[`_CIlog`](../cilog.md)\
130+
[`_CIlog10`](../cilog10.md)

docs/c-runtime-library/reference/strrchr-wcsrchr-mbsrchr-mbsrchr-l.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: strrchr, wcsrchr, _mbsrchr, _mbsrchr_l"
32
title: "strrchr, wcsrchr, _mbsrchr, _mbsrchr_l"
3+
description: "Learn more about: strrchr, wcsrchr, _mbsrchr, _mbsrchr_l"
44
ms.date: "4/2/2020"
55
api_name: ["strrchr", "wcsrchr", "_mbsrchr", "_mbsrchr_l", "_o__mbsrchr", "_o__mbsrchr_l"]
66
api_location: ["msvcrt.dll", "msvcr80.dll", "msvcr90.dll", "msvcr100.dll", "msvcr100_clr0400.dll", "msvcr110.dll", "msvcr110_clr0400.dll", "msvcr120.dll", "msvcr120_clr0400.dll", "ntdll.dll", "ucrtbase.dll", "api-ms-win-crt-multibyte-l1-1-0.dll", "ntoskrnl.exe"]
@@ -131,4 +131,4 @@ For an example of using **`strrchr`**, see [`strchr`](strchr-wcschr-mbschr-mbsch
131131
[`strcspn`, `wcscspn`, `_mbscspn`, `_mbscspn_l`](strcspn-wcscspn-mbscspn-mbscspn-l.md)\
132132
[`_strnicmp`, `_wcsnicmp`, `_mbsnicmp`, `_strnicmp_l`, `_wcsnicmp_l`, `_mbsnicmp_l`](strnicmp-wcsnicmp-mbsnicmp-strnicmp-l-wcsnicmp-l-mbsnicmp-l.md)\
133133
[`strpbrk`, `wcspbrk`, `_mbspbrk`, `_mbspbrk_l`](strpbrk-wcspbrk-mbspbrk-mbspbrk-l.md)\
134-
[`strspn`, `wcsspn`, `_mbsspn`, `_mbsspn_l`](strspn-wcsspn-mbsspn-mbsspn-l.md)\
134+
[`strspn`, `wcsspn`, `_mbsspn`, `_mbsspn_l`](strspn-wcsspn-mbsspn-mbsspn-l.md)

docs/code-quality/c28196.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 C28196"
32
title: Warning C28196
3+
description: "Learn more about: Warning C28196"
44
ms.date: 11/04/2016
55
f1_keywords: ["C28196", "RETURNING_BAD_RESULT", "__WARNING_RETURNING_BAD_RESULT"]
66
helpviewer_keywords: ["C28196"]
7-
ms.assetid: 5ee89e96-2796-4316-a64c-702463ca1374
87
---
98
# Warning C28196
109

@@ -51,4 +50,4 @@ Item *get_item(_In_reads_(len) Item *items, size_t len, size_t index) {
5150
## See also
5251

5352
[Annotating function parameters and return values](./annotating-function-parameters-and-return-values.md)\
54-
[Specifying When and Where an Annotation Applies](./specifying-when-and-where-an-annotation-applies.md)\
53+
[Specifying When and Where an Annotation Applies](./specifying-when-and-where-an-annotation-applies.md)

docs/cpp/com-ptr-t-extractors.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ description: "Describes the extraction operators for the _com_ptr_t class."
44
ms.date: 07/07/2020
55
f1_keywords: ["_com_ptr_t::operatorInterface&", "_com_ptr_t::operatorbool", "_com_ptr_t::operator->", "_com_ptr_t::operator*"]
66
helpviewer_keywords: ["operator Interface& [C++]", "* operator [C++], with specific objects", "operator& [C++]", "operator* [C++]", "-> operator [C++], with specific objects", "& operator [C++], with specific objects", "operator Interface* [C++]", "operator * [C++]", "operator->", "operator bool", "extractors, _com_ptr_t class", "extractors [C++]"]
7-
ms.assetid: 194b9e0e-123c-49ff-a187-0a7fcd68145a
87
---
98
# `_com_ptr_t` Extractors
109

@@ -14,7 +13,7 @@ Extract the encapsulated COM interface pointer.
1413

1514
## Syntax
1615

17-
```c++
16+
```cpp
1817
operator Interface*( ) const throw( );
1918
operator Interface&( ) const;
2019
Interface& operator*( ) const;
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
---
2-
description: "Learn more about: Compiler Error C2640"
32
title: "Compiler Error C2640"
4-
ms.date: "11/04/2016"
3+
description: "Learn more about: Compiler Error C2640"
4+
ms.date: "03/17/2025"
55
f1_keywords: ["C2640"]
66
helpviewer_keywords: ["C2640"]
7-
ms.assetid: e4d137ab-ed1d-457c-9eec-b70d97f1b0b4
87
---
98
# Compiler Error C2640
109

11-
'identifier' : __based modifier illegal on reference
10+
> 'abstract declarator': __based modifier illegal on reference
1211
13-
The **`__based`** modifier can be used on pointers only.
12+
The [**`__based`**](../../cpp/based-pointers-cpp.md) modifier can be used on pointers only.
1413

1514
The following sample generates C2640:
1615

1716
```cpp
1817
// C2640.cpp
19-
void f(int i) {
20-
void *vp;
21-
int _based(vp) &vr = I; // C2640
18+
int* ptr;
19+
20+
int main()
21+
{
22+
int __based(ptr)& based_ref; // C2640
23+
int __based(ptr)* based_ptr; // OK
2224
}
2325
```

0 commit comments

Comments
 (0)