Skip to content

Commit 1e5e302

Browse files
author
Colin Robertson
committed
Update keywords through __ptr64 for synonyms
1 parent 01cd3fa commit 1e5e302

14 files changed

+47
-27
lines changed

docs/assembler/inline/asm.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__asm | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "08/30/2018"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-masm"]
66
ms.topic: "conceptual"
7-
f1_keywords: ["__asm", "__asm_cpp"]
7+
f1_keywords: ["__asm", "_asm", "__asm_cpp"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__asm keyword [C++], vs. asm blocks", "__asm keyword [C++]"]
1010
ms.assetid: 77ff3bc9-a492-4b5e-85e1-fa4e414e79cd
@@ -47,6 +47,8 @@ did not cause native code to be generated when compiled with **/clr**; the compi
4747

4848
`__asm int 3` now results in native code generation for the function. If you want a function to cause a break point in your code and if you want that function compiled to MSIL, use [__debugbreak](../../intrinsics/debugbreak.md).
4949

50+
For compatibility with previous versions, **_asm** is a synonym for **__asm** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
51+
5052
## Example
5153

5254
The following code fragment is a simple `__asm` block enclosed in braces:

docs/cpp/alignof-operator.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__alignof Operator | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["alignas_cpp", "__alignof_cpp", "alignof_cpp"]
7+
f1_keywords: ["alignas_cpp", "__alignof_cpp", "alignof_cpp", "__alignof", "_alignof"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["alignas [C++]", "alignment of structures", "__alignof keyword [C++]", "alignof [C++]", "types [C++], alignment requirements"]
1010
ms.assetid: acb1eed7-6398-40bd-b0c5-684ceb64afbc
@@ -65,6 +65,8 @@ int n = 50; // array size
6565
S* p = (S*)aligned_malloc(n * sizeof(S), __alignof(S));
6666
```
6767

68+
For compatibility with previous versions, **_alignof** is a synonym for **__alignof** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
69+
6870
For more information on modifying alignment, see:
6971

7072
- [pack](../preprocessor/pack.md)

docs/cpp/based-pointers-cpp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "Based Pointers (C++) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__based", "__based_cpp"]
7+
f1_keywords: ["__based", "_based", "__based_cpp"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__based keyword [C++]", "based pointers", "pointers, based"]
1010
ms.assetid: 1e5f2e96-c52e-4738-8e14-87278681205e
@@ -48,7 +48,7 @@ The pointer `vpBuffer` is assigned the address of memory allocated at some later
4848
4949
When dereferencing a based pointer, the base must be either explicitly specified or implicitly known through the declaration.
5050
51-
For compatibility with previous versions, **_based** is a synonym for **__based**.
51+
For compatibility with previous versions, **_based** is a synonym for **__based** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
5252
5353
## Example
5454

docs/cpp/cdecl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ms.custom: ""
44
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__cdecl_cpp", "__cdecl", "_cdecl" ]
7+
f1_keywords: ["__cdecl_cpp", "__cdecl", "_cdecl", "cdecl"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__cdecl keyword [C++]"]
1010
ms.assetid: 1ff1d03e-fb4e-4562-8be1-74f1ad6427f1
@@ -52,7 +52,7 @@ is equivalent to this:
5252
void __cdecl CMyClass::mymethod() { return; }
5353
```
5454
55-
For compatibility with previous versions, **_cdecl** is a synonym for **__cdecl** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
55+
For compatibility with previous versions, **cdecl** and **_cdecl** are a synonym for **__cdecl** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
5656
5757
## Example
5858

docs/cpp/declspec.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__declspec | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "1/23/2018"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__declspec_cpp"]
7+
f1_keywords: ["__declspec_cpp", "__declspec", "_declspec"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__declspec keyword [C++]"]
1010
author: "mikeblome"
@@ -56,6 +56,8 @@ Extended attribute grammar supports these Microsoft-specific storage-class attri
5656

5757
The **code_seg**, **dllexport**, **dllimport**, **naked**, **noalias**, **nothrow**, **property**, **restrict**, **selectany**, **thread**, and **uuid** storage-class attributes are properties only of the declaration of the object or function to which they are applied. The **thread** attribute affects data and objects only. The **naked** and **spectre** attributes affect functions only. The **dllimport** and **dllexport** attributes affect functions, data, and objects. The **property**, **selectany**, and **uuid** attributes affect COM objects.
5858

59+
For compatibility with previous versions, **_declspec** is a synonym for **__declspec** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
60+
5961
The **__declspec** keywords should be placed at the beginning of a simple declaration. The compiler ignores, without warning, any **__declspec** keywords placed after * or & and in front of the variable identifier in a declaration.
6062

6163
A **__declspec** attribute specified in the beginning of a user-defined type declaration applies to the variable of that type. For example:

docs/cpp/fastcall.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__fastcall | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__fastcall_cpp"]
7+
f1_keywords: ["__fastcall_cpp", "__fastcall", "_fastcall"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__fastcall keyword [C++]"]
1010
ms.assetid: bb5b9c8a-dfad-450c-9119-0ac2bc59544f
@@ -52,6 +52,8 @@ is equivalent to this:
5252
void __fastcall CMyClass::mymethod() { return; }
5353
```
5454
55+
For compatibility with previous versions, **_fastcall** is a synonym for **__fastcall** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
56+
5557
## Example
5658
5759
In the following example, the function `DeleteAggrWrapper` is passed arguments in registers:

docs/cpp/inheritance-keywords.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ regardless of command-line options or pragmas, pointers to members of `class S`
6161
> [!NOTE]
6262
> The same forward declaration of a class pointer-to-member representation should occur in every translation unit that declares pointers to members of that class, and the declaration should occur before the pointers to members are declared.
6363
64+
For compatibility with previous versions, **_single_inheritance**, **_multiple_inheritance**, and **_virtual_inheritance** are synonyms for **__single_inheritance**, **__multiple_inheritance**, and **__virtual_inheritance** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
65+
6466
**END Microsoft Specific**
6567
6668
## See also

docs/cpp/inline-functions-cpp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "Inline Functions (C++) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__forceinline_cpp", "__inline_cpp", "inline_cpp"]
7+
f1_keywords: ["__forceinline_cpp", "__inline_cpp", "inline_cpp", "__inline", "_inline", "__forceinline", "_forceinline"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["inline functions [C++], class members"]
1010
ms.assetid: 355f120c-2847-4608-ac04-8dda18ffe10c
@@ -71,7 +71,7 @@ Using inline functions can make your program faster because they eliminate the o
7171
7272
The compiler treats the inline expansion options and keywords as suggestions. There is no guarantee that functions will be inlined. You cannot force the compiler to inline a particular function, even with the **__forceinline** keyword. When compiling with **/clr**, the compiler will not inline a function if there are security attributes applied to the function.
7373
74-
The **inline** keyword is available only in C++. The **__inline** and **__forceinline** keywords are available in both C and C++. For compatibility with previous versions, **_inline** is a synonym for **__inline** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
74+
The **inline** keyword is available only in C++. The **__inline** and **__forceinline** keywords are available in both C and C++. For compatibility with previous versions, **_inline** and **_forceinline** are synonyms for **__inline**, and **__forceinline** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
7575
7676
The **inline** keyword tells the compiler that inline expansion is preferred. However, the compiler can create a separate instance of the function (instantiate) and create standard calling linkages instead of inserting the code inline. Two cases where this can happen are:
7777

docs/cpp/int8-int16-int32-int64.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__int8, __int16, __int32, __int64 | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__int8_cpp", "__int16_cpp", "__int32_cpp", "__int64_cpp"]
7+
f1_keywords: ["__int8_cpp", "__int16_cpp", "__int32_cpp", "__int64_cpp", "__int8", "__int16", "__int32", "__int64", "_int8", "_int16", "_int32", "_int64"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__int16 keyword [C++]", "integer data type [C++], integer types in C++", "__int32 keyword [C++]", "integer types [C++]", "__int8 keyword [C++]", "__int64 keyword [C++]"]
1010
ms.assetid: 8e384602-2578-4980-8cc8-da63842356b2
@@ -29,6 +29,8 @@ __int64 nHuge; // Declares 64-bit integer
2929

3030
The types **__int8**, **__int16**, and **__int32** are synonyms for the ANSI types that have the same size, and are useful for writing portable code that behaves identically across multiple platforms. The **__int8** data type is synonymous with type **char**, **__int16** is synonymous with type **short**, and **__int32** is synonymous with type **int**. The **__int64** type is synonymous with type **long long**.
3131

32+
For compatibility with previous versions, **_int8**, **_int16**, **_int32**, and **_int64** are synonyms for **__int8**, **__int16**, **__int32**, and **__int64** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
33+
3234
## Example
3335

3436
The following sample shows that an __int*xx* parameter will be promoted to **int**:

docs/cpp/keywords-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Keywords are predefined reserved identifiers that have special meanings. They ca
1717

1818
|||||
1919
|-|-|-|-|
20-
|[__abstract](../dotnet/declaration-of-a-managed-class-type.md) <sup>2</sup>|[__alignof Operator](alignof-operator.md) <sup>4</sup>|[__asm](../assembler/inline/asm.md)<sup>4</sup>|[__assume](../intrinsics/assume.md) <sup>4</sup>|
20+
|[__abstract](../dotnet/declaration-of-a-managed-class-type.md) <sup>2</sup>|[__alignof Operator](alignof-operator.md) <sup>4</sup>|[__asm](../assembler/inline/asm.md) <sup>4</sup>|[__assume](../intrinsics/assume.md) <sup>4</sup>|
2121
|[__based](based-pointers-cpp.md) <sup>4</sup>|[__box](../dotnet/value-type-semantics.md) <sup>2</sup>|[__cdecl](cdecl.md) <sup>4</sup>|[__declspec](declspec.md) <sup>4</sup>|
2222
|[__delegate](../dotnet/delegates-and-events.md) <sup>2</sup>|[__event](event.md)|[__except](try-except-statement.md) <sup>4</sup>|[__fastcall](fastcall.md) <sup>4</sup>|
2323
|[__finally](try-finally-statement.md) <sup>4</sup>|[__forceinline](inline-functions-cpp.md) <sup>4</sup>|[__gc](../dotnet/declaration-of-a-clr-reference-class-object.md) <sup>2</sup>|[__hook](hook.md) <sup>3</sup>|

docs/cpp/ptr32-ptr64.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__ptr32, __ptr64 | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__ptr32_cpp", "__ptr64_cpp"]
7+
f1_keywords: ["__ptr32_cpp", "__ptr64_cpp", "__ptr32", "__ptr64", "_ptr32", "_ptr64"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__ptr64 keyword [C++]", "_ptr32 keyword [C++]", "ptr32 keyword [C++]", "ptr64 keyword [C++]", "_ptr64 keyword [C++]", "__ptr32 keyword [C++]"]
1010
ms.assetid: afb563d8-7458-4fe7-9c30-bd4b5385a59f
@@ -30,6 +30,8 @@ On a 32-bit system, a pointer declared with **__ptr64** is truncated to a 32-bit
3030
> [!NOTE]
3131
> You cannot use **__ptr32** or **__ptr64** when compiling with **/clr:pure**. Otherwise, Compiler Error C2472 will be generated. The **/clr:pure** and **/clr:safe** compiler options are deprecated in Visual Studio 2015 and unsupported in Visual Studio 2017.
3232
33+
For compatibility with previous versions, **_ptr32** and **_ptr64** are synonyms for **__ptr32** and **__ptr64** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
34+
3335
## Example
3436

3537
The following example shows how to declare and allocate pointers with the **__ptr32** and **__ptr64** keywords.

docs/cpp/try-except-statement.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "try-except Statement | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "10/05/2018"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["_abnormal_termination_cpp", "_exception_code_cpp", "EXCEPTION_CONTINUE_SEARCH", "_exception_info", "__except", "EXCEPTION_CONTINUE_EXECUTION", "_exception_code", "__except_cpp", "_exception_info_cpp", "EXCEPTION_EXECUTE_HANDLER", "_abnormal_termination"]
7+
f1_keywords: ["_abnormal_termination_cpp", "_exception_code_cpp", "EXCEPTION_CONTINUE_SEARCH", "_exception_info", "__except", "_except" "EXCEPTION_CONTINUE_EXECUTION", "_exception_code", "__except_cpp", "_exception_info_cpp", "EXCEPTION_EXECUTE_HANDLER", "_abnormal_termination"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__try keyword [C++]", "EXCEPTION_CONTINUE_EXECUTION macro", "EXCEPTION_CONTINUE_SEARCH macro", "EXCEPTION_EXECUTE_HANDLER macro", "GetExceptionCode function", "try-catch keyword [C++], try-except keyword [C++]", "_exception_code keyword [C++]", "try-except keyword [C++]", "_exception_info keyword [C++]", "_abnormal_termination keyword [C++]"]
1010
ms.assetid: 30d60071-ea49-4bfb-a8e6-7a420de66381
@@ -60,6 +60,8 @@ Each application can have its own exception handler.
6060

6161
It is not valid to jump into a **__try** statement, but valid to jump out of one. The exception handler is not called if a process is terminated in the middle of executing a **try-except** statement.
6262

63+
For compatibility with previous versions, **_try**, **_except**, and **_leave** are synonyms for **__try**, **__except**, and **__leave** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
64+
6365
### The __leave Keyword
6466

6567
The **__leave** keyword is valid only within the guarded section of a **try-except** statement, and its effect is to jump to the end of the guarded section. Execution continues at the first statement after the exception handler.

docs/cpp/try-finally-statement.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "try-finally Statement | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
7-
f1_keywords: ["__try", "__leave_cpp", "__leave", "__finally_cpp", "__try_cpp", "__finally"]
7+
f1_keywords: ["__try", "_try", "__leave_cpp", "__leave", "__finally_cpp", "__try_cpp", "__finally", "_finally"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__try keyword [C++]", "__finally keyword [C++]", "__leave keyword [C++]", "try-catch keyword [C++], try-finally keyword", "try-finally keyword [C++]", "__finally keyword [C++], try-finally statement syntax", "__leave keyword [C++], try-finally statement", "structured exception handling [C++], try-finally"]
1010
ms.assetid: 826e0347-ddfe-4f6e-a7bc-0398e0edc7c2
@@ -61,6 +61,8 @@ Order of Termination-Handler Execution
6161
> [!NOTE]
6262
> The behavior of try-finally is different from some other languages that support the use of **finally**, such as C#. A single **__try** may have either, but not both, of **__finally** and **__except**. If both are to be used together, an outer try-except statement must enclose the inner try-finally statement. The rules specifying when each block executes are also different.
6363
64+
For compatibility with previous versions, **_try**, **_finally**, and **_leave** are synonyms for **__try**, **__finally**, and **__leave** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
65+
6466
## The __leave Keyword
6567

6668
The **__leave** keyword is valid only within the guarded section of a **try-finally** statement, and its effect is to jump to the end of the guarded section. Execution continues at the first statement in the termination handler.

docs/intrinsics/assume.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: "__assume | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "11/04/2016"
4+
ms.date: "10/09/2018"
55
ms.technology: ["cpp-tools"]
66
ms.topic: "reference"
7-
f1_keywords: ["__assume", "__assume_cpp"]
7+
f1_keywords: ["__assume", "_assume", "__assume_cpp"]
88
dev_langs: ["C++"]
99
helpviewer_keywords: ["__assume keyword [C++]"]
1010
ms.assetid: d8565123-b132-44b1-8235-5a8c8bff85a7
@@ -46,6 +46,8 @@ Use `__assume` in an [ASSERT](../c-runtime-library/reference/assert-asserte-asse
4646

4747
The `__assume(0)` statement is a special case. Use `__assume(0)` to indicate a code path that cannot be reached. The following example shows how to use `__assume(0)` to indicate that the default case of a switch statement cannot be reached. This shows the most typical use of `__assume(0)`.
4848

49+
For compatibility with previous versions, **_assume** is a synonym for **__assume** unless compiler option [/Za \(Disable language extensions)](../build/reference/za-ze-disable-language-extensions.md) is specified.
50+
4951
## Requirements
5052

5153
|Intrinsic|Architecture|

0 commit comments

Comments
 (0)