Skip to content

Commit edb46b0

Browse files
TaojunshenTaojunshen
authored
Merge pull request #1406 from MicrosoftDocs/master
9/25 AM Publish
2 parents 92c568e + 92ae6be commit edb46b0

File tree

47 files changed

+968
-1531
lines changed

Some content is hidden

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

47 files changed

+968
-1531
lines changed

‎.openpublishing.redirection.json

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6550,6 +6550,51 @@
65506550
"redirect_url": "/cpp/windows/implements-structure#iidcount",
65516551
"redirect_document_id": false
65526552
},
6553+
{
6554+
"source_path": "docs/windows/invokehelper-callback-data-member.md",
6555+
"redirect_url": "/cpp/windows/invokehelper-structure#callback",
6556+
"redirect_document_id": false
6557+
},
6558+
{
6559+
"source_path": "docs/windows/invokehelper-invoke-method.md",
6560+
"redirect_url": "/cpp/windows/invokehelper-structure#invoke",
6561+
"redirect_document_id": false
6562+
},
6563+
{
6564+
"source_path": "docs/windows/invokehelper-invokehelper-constructor.md",
6565+
"redirect_url": "/cpp/windows/invokehelper-structure#invokehelper",
6566+
"redirect_document_id": false
6567+
},
6568+
{
6569+
"source_path": "docs/windows/isbaseofstrict-value-constant.md",
6570+
"redirect_url": "/cpp/windows/isbaseofstrict-structure#value",
6571+
"redirect_document_id": false
6572+
},
6573+
{
6574+
"source_path": "docs/windows/issame-value-constant.md",
6575+
"redirect_url": "/cpp/windows/issame-structure#value",
6576+
"redirect_document_id": false
6577+
},
6578+
{
6579+
"source_path": "docs/windows/makeallocator-tilde-makeallocator-destructor.md",
6580+
"redirect_url": "/cpp/windows/makeallocator-class#tilde-makeallocator",
6581+
"redirect_document_id": false
6582+
},
6583+
{
6584+
"source_path": "docs/windows/makeallocator-allocate-method.md",
6585+
"redirect_url": "/cpp/windows/makeallocator-class#allocate",
6586+
"redirect_document_id": false
6587+
},
6588+
{
6589+
"source_path": "docs/windows/makeallocator-detach-method.md",
6590+
"redirect_url": "/cpp/windows/makeallocator-class#detach",
6591+
"redirect_document_id": false
6592+
},
6593+
{
6594+
"source_path": "docs/windows/makeallocator-makeallocator-constructor.md",
6595+
"redirect_url": "/cpp/windows/makeallocator-class#makeallocator",
6596+
"redirect_document_id": false
6597+
},
65536598
{
65546599
"source_path": "docs/windows/module-tilde-module-destructor.md",
65556600
"redirect_url": "/cpp/windows/module-class#tilde-module",
@@ -6695,6 +6740,26 @@
66956740
"redirect_url": "/cpp/windows/module-releasenotifier-class#releasenotifier-tilde-releasenotifier",
66966741
"redirect_document_id": false
66976742
},
6743+
{
6744+
"source_path": "docs/windows/modulebase-tilde-modulebase-destructor.md",
6745+
"redirect_url": "/cpp/windows/modulebase-class#tilde-modulebase",
6746+
"redirect_document_id": false
6747+
},
6748+
{
6749+
"source_path": "docs/windows/modulebase-decrementobjectcount-method.md",
6750+
"redirect_url": "/cpp/windows/modulebase-class#decrementobjectcount",
6751+
"redirect_document_id": false
6752+
},
6753+
{
6754+
"source_path": "docs/windows/modulebase-incrementobjectcount-method.md",
6755+
"redirect_url": "/cpp/windows/modulebase-class#incrementobjectcount",
6756+
"redirect_document_id": false
6757+
},
6758+
{
6759+
"source_path": "docs/windows/modulebase-modulebase-constructor.md",
6760+
"redirect_url": "/cpp/windows/modulebase-class#modulebase",
6761+
"redirect_document_id": false
6762+
},
66986763
{
66996764
"source_path": "docs/windows/runtimeclass-tilde-runtimeclass-destructor.md",
67006765
"redirect_url": "/cpp/windows/runtimeclass-class#tilde-runtimeclass",
@@ -6755,6 +6820,16 @@
67556820
"redirect_url": "/cpp/windows/runtimeclassflags-structure#value-constant",
67566821
"redirect_document_id": false
67576822
},
6823+
{
6824+
"source_path": "docs/windows/runtimeclassbaset-asiid-method.md",
6825+
"redirect_url": "/cpp/windows/runtimeclassbaset-structure#asiid",
6826+
"redirect_document_id": false
6827+
},
6828+
{
6829+
"source_path": "docs/windows/runtimeclassbaset-getimplementediids-method.md",
6830+
"redirect_url": "/cpp/windows/runtimeclassbaset-structure#getimplementediids",
6831+
"redirect_document_id": false
6832+
},
67586833
{
67596834
"source_path": "docs/windows/simpleactivationfactory-activateinstance-method.md",
67606835
"redirect_url": "/cpp/windows/simpleactivationfactory-class#activateinstance",
@@ -6775,6 +6850,16 @@
67756850
"redirect_url": "/cpp/windows/simpleclassfactory-class#createinstance",
67766851
"redirect_document_id": false
67776852
},
6853+
{
6854+
"source_path": "docs/windows/verifyinheritancehelper-verify-method.md",
6855+
"redirect_url": "/cpp/windows/verifyinheritancehelper-structure#verify",
6856+
"redirect_document_id": false
6857+
},
6858+
{
6859+
"source_path": "docs/windows/verifyinterfacehelper-verify-method.md",
6860+
"redirect_url": "/cpp/windows/verifyinterfacehelper-structure#verify",
6861+
"redirect_document_id": false
6862+
},
67786863
{
67796864
"source_path": "docs/windows/weakref-tilde-weakref-destructor.md",
67806865
"redirect_url": "/cpp/windows/weakref-class#tilde-weakref",
@@ -6814,6 +6899,36 @@
68146899
"source_path": "docs/windows/walkthrough-creating-a-basic-windows-runtime-component-using-wrl.md",
68156900
"redirect_url": "/cpp/windows/windows-runtime-cpp-template-library-wrl",
68166901
"redirect_document_id": false
6902+
},
6903+
{
6904+
"source_path": "docs/windows/weakreference-tilde-weakreference-destructor.md",
6905+
"redirect_url": "/cpp/windows/weakreference-class1#tilde-weakreference",
6906+
"redirect_document_id": false
6907+
},
6908+
{
6909+
"source_path": "docs/windows/weakreference-decrementstrongreference-method.md",
6910+
"redirect_url": "/cpp/windows/weakreference-class1#decrementstrongreference",
6911+
"redirect_document_id": false
6912+
},
6913+
{
6914+
"source_path": "docs/windows/weakreference-incrementstrongreference-method.md",
6915+
"redirect_url": "/cpp/windows/weakreference-class1#incrementstrongreference",
6916+
"redirect_document_id": false
6917+
},
6918+
{
6919+
"source_path": "docs/windows/weakreference-resolve-method.md",
6920+
"redirect_url": "/cpp/windows/weakreference-class1#resolve",
6921+
"redirect_document_id": false
6922+
},
6923+
{
6924+
"source_path": "docs/windows/weakreference-setunknown-method.md",
6925+
"redirect_url": "/cpp/windows/weakreference-class1#setunknown",
6926+
"redirect_document_id": false
6927+
},
6928+
{
6929+
"source_path": "docs/windows/weakreference-weakreference-constructor.md",
6930+
"redirect_url": "/cpp/windows/weakreference-class1#weakreference",
6931+
"redirect_document_id": false
68176932
}
68186933
]
68196934
}

‎docs/cpp/keywords-cpp.md

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Keywords (C++) | Microsoft Docs"
33
ms.custom: "index-page"
4-
ms.date: "09/18/2018"
4+
ms.date: "09/24/2018"
55
ms.technology: ["cpp-language"]
66
ms.topic: "language-reference"
77
dev_langs: ["C++"]
@@ -15,8 +15,8 @@ ms.workload: ["cplusplus"]
1515

1616
Keywords are predefined reserved identifiers that have special meanings. They cannot be used as identifiers in your program. The following keywords are reserved for Microsoft C++. Names with leading underscores are Microsoft extensions.
1717

18-
||||
19-
|-|-|-|
18+
|||||
19+
|-|-|-|-|
2020
|[__abstract](../dotnet/declaration-of-a-managed-class-type.md) <sup>2</sup>|[__alignof Operator](alignof-operator.md)|[__asm](../assembler/inline/asm.md)|[__assume](../intrinsics/assume.md)|
2121
|[__based](based-pointers-cpp.md)|[__box](../dotnet/value-type-semantics.md) <sup>2</sup>|[__cdecl](cdecl.md)|[__declspec](declspec.md)|
2222
|[__delegate](../dotnet/delegates-and-events.md) <sup>2</sup>|[__event](event.md)|[__except](try-except-statement.md)|[__fastcall](fastcall.md)|
@@ -25,8 +25,9 @@ Keywords are predefined reserved identifiers that have special meanings. They ca
2525
|[__int16](int8-int16-int32-int64.md)|[__int32](int8-int16-int32-int64.md)|[__int64](int8-int16-int32-int64.md)|[__int8](int8-int16-int32-int64.md)|
2626
|[__interface](interface.md)|[__leave](try-finally-statement.md)|[__m128](m128.md)|[__m128d](m128d.md)|
2727
|[__m128i](m128i.md)|[__m64](m64.md)|[__multiple_inheritance](inheritance-keywords.md)|[__nogc](../dotnet/declaration-of-a-clr-reference-class-object.md) <sup>2</sup>|
28-
|[__noop](../intrinsics/noop.md)|**__pin** <sup>2</sup>|**__property** <sup>2</sup>|[__raise](raise.md)|**__sealed** <sup>2</sup>|[__single_inheritance](inheritance-keywords.md)|[__stdcall](stdcall.md)|[__super](super.md)|
29-
|[__thiscall](thiscall.md)|[__try/\__except](try-except-statement.md)| [__try/\__finally](try-finally-statement.md)|[__try_cast](../dotnet/cast-notation-and-introduction-of-safe-cast-angles.md) <sup>2</sup>|
28+
|[__noop](../intrinsics/noop.md)|**__pin** <sup>2</sup>|**__property** <sup>2</sup>|[__raise](raise.md)|
29+
|**__sealed** <sup>2</sup>|[__single_inheritance](inheritance-keywords.md)|[__stdcall](stdcall.md)|[__super](super.md)|
30+
|[__thiscall](thiscall.md)|[__try/\__except](try-except-statement.md)|[__try/\__finally](try-finally-statement.md)|[__try_cast](../dotnet/cast-notation-and-introduction-of-safe-cast-angles.md) <sup>2</sup>|
3031
|[__unaligned](unaligned.md)|[__unhook](unhook.md) <sup>3</sup>|[__uuidof](uuidof-operator.md)|[__value](../dotnet/value-type-semantics.md) <sup>2</sup>|
3132
|[__virtual_inheritance](inheritance-keywords.md)|[__w64](w64.md)|[__wchar_t](fundamental-types-cpp.md)|[abstract](../windows/abstract-cpp-component-extensions.md)|
3233
|[alignas](align-cpp.md)|[array](../windows/arrays-cpp-component-extensions.md)|[auto](auto-keyword.md)|[bool](bool-cpp.md)|
@@ -38,26 +39,26 @@ Keywords are predefined reserved identifiers that have special meanings. They ca
3839
|[dynamic_cast](dynamic-cast-operator.md)|[else](if-else-statement-cpp.md)|[enum](enumerations-cpp.md)|[enum class](../windows/enum-class-cpp-component-extensions.md)|
3940
|[enum struct](../windows/enum-class-cpp-component-extensions.md)|[event](../windows/event-cpp-component-extensions.md)|[explicit](user-defined-type-conversions-cpp.md)|[extern](using-extern-to-specify-linkage.md)|
4041
|[false](false-cpp.md)|[finally](../dotnet/finally.md)|[float](fundamental-types-cpp.md)|[for](for-statement-cpp.md)|
41-
|[for each in](../dotnet/for-each-in.md)|[friend](friend-cpp.md)|[friend_as](../preprocessor/hash-using-directive-cpp.md)|
42-
|[gcnew](../windows/ref-new-gcnew-cpp-component-extensions.md)|[generic](../windows/generics-cpp-component-extensions.md)|[goto](goto-statement-cpp.md)|[if](if-else-statement-cpp.md)|
43-
|[initonly](../dotnet/initonly-cpp-cli.md)|[inline](inline-functions-cpp.md)|[int](fundamental-types-cpp.md)|[interface class](../windows/interface-class-cpp-component-extensions.md)|
44-
|[interface struct](../windows/interface-class-cpp-component-extensions.md)|[interior_ptr](../windows/interior-ptr-cpp-cli.md)|[literal](../windows/literal-cpp-component-extensions.md)|[long](fundamental-types-cpp.md)|
45-
|[mutable](mutable-data-members-cpp.md)|[naked](naked-cpp.md) <sup>1</sup>|[namespace](namespaces-cpp.md)|[new](../windows/new-new-slot-in-vtable-cpp-component-extensions.md)|
46-
|[new](new-operator-cpp.md)|[noexcept](noexcept-cpp.md)|[noinline](noinline.md) <sup>1</sup>|[noreturn](noreturn.md) <sup>1</sup>|
47-
|[nothrow](nothrow-cpp.md) <sup>1</sup>|[novtable](novtable.md) <sup>1</sup>|[nullptr](nullptr.md)|[operator](operator-overloading.md)|
48-
|[private](private-cpp.md)|[property](../windows/property-cpp-component-extensions.md)|[property](property-cpp.md) <sup>1</sup>|[protected](protected-cpp.md)|
49-
|[public](public-cpp.md)|[ref class](../windows/classes-and-structs-cpp-component-extensions.md)|[ref struct](../windows/classes-and-structs-cpp-component-extensions.md)|[register](storage-classes-cpp.md#register)|
50-
|[reinterpret_cast](reinterpret-cast-operator.md)|[return](return-statement-cpp.md)|[safecast](../windows/safe-cast-cpp-component-extensions.md)|[sealed](../windows/sealed-cpp-component-extensions.md)|
51-
|[selectany](selectany.md) <sup>1</sup>|[short](fundamental-types-cpp.md)|[signed](fundamental-types-cpp.md)|[sizeof](sizeof-operator.md)|
52-
|[static](storage-classes-cpp.md)|[static_assert](static-assert.md)|[static_cast](static-cast-operator.md)|[struct](struct-cpp.md)|
53-
|[switch](switch-statement-cpp.md)|[template](templates-cpp.md)|[this](this-pointer.md)|[thread](thread.md) <sup>1</sup>|
54-
|[throw](try-throw-and-catch-statements-cpp.md)|[true](true-cpp.md)|[try](try-throw-and-catch-statements-cpp.md)|[typedef](aliases-and-typedefs-cpp.md)|
55-
|[typeid](typeid-operator.md)|[typeid](../windows/typeid-cpp-component-extensions.md)|[typename](typename.md)|[union](unions.md)|
56-
|[unsigned](fundamental-types-cpp.md)|[using](using-declaration.md) declaration|[using](namespaces-cpp.md#using_directives) directive|
57-
|[uuid](uuid-cpp.md) <sup>1</sup>|[value class](../windows/classes-and-structs-cpp-component-extensions.md)|[value struct](../windows/classes-and-structs-cpp-component-extensions.md)|
58-
|[virtual](virtual-cpp.md)|[void](void-cpp.md)|[volatile](volatile-cpp.md)|
42+
|[for each in](../dotnet/for-each-in.md)|[friend](friend-cpp.md)|[friend_as](../preprocessor/hash-using-directive-cpp.md)|[gcnew](../windows/ref-new-gcnew-cpp-component-extensions.md)|
43+
|[generic](../windows/generics-cpp-component-extensions.md)|[goto](goto-statement-cpp.md)|[if](if-else-statement-cpp.md)|[initonly](../dotnet/initonly-cpp-cli.md)|
44+
|[inline](inline-functions-cpp.md)|[int](fundamental-types-cpp.md)|[interface class](../windows/interface-class-cpp-component-extensions.md)|[interface struct](../windows/interface-class-cpp-component-extensions.md)|
45+
|[interior_ptr](../windows/interior-ptr-cpp-cli.md)|[literal](../windows/literal-cpp-component-extensions.md)|[long](fundamental-types-cpp.md)|[mutable](mutable-data-members-cpp.md)|
46+
|[naked](naked-cpp.md) <sup>1</sup>|[namespace](namespaces-cpp.md)|[new](../windows/new-new-slot-in-vtable-cpp-component-extensions.md)|[new](new-operator-cpp.md)|
47+
|[noexcept](noexcept-cpp.md)|[noinline](noinline.md) <sup>1</sup>|[noreturn](noreturn.md) <sup>1</sup>|[nothrow](nothrow-cpp.md) <sup>1</sup>|
48+
|[novtable](novtable.md) <sup>1</sup>|[nullptr](nullptr.md)|[operator](operator-overloading.md)|[private](private-cpp.md)|
49+
|[property](../windows/property-cpp-component-extensions.md)|[property](property-cpp.md) <sup>1</sup>|[protected](protected-cpp.md)|[public](public-cpp.md)|
50+
|[ref class](../windows/classes-and-structs-cpp-component-extensions.md)|[ref struct](../windows/classes-and-structs-cpp-component-extensions.md)|[register](storage-classes-cpp.md#register)|[reinterpret_cast](reinterpret-cast-operator.md)|
51+
|[return](return-statement-cpp.md)|[safecast](../windows/safe-cast-cpp-component-extensions.md)|[sealed](../windows/sealed-cpp-component-extensions.md)|[selectany](selectany.md) <sup>1</sup>|
52+
|[short](fundamental-types-cpp.md)|[signed](fundamental-types-cpp.md)|[sizeof](sizeof-operator.md)|[static](storage-classes-cpp.md)|
53+
|[static_assert](static-assert.md)|[static_cast](static-cast-operator.md)|[struct](struct-cpp.md)|[switch](switch-statement-cpp.md)|
54+
|[template](templates-cpp.md)|[this](this-pointer.md)|[thread](thread.md) <sup>1</sup>|[throw](try-throw-and-catch-statements-cpp.md)|
55+
|[true](true-cpp.md)|[try](try-throw-and-catch-statements-cpp.md)|[typedef](aliases-and-typedefs-cpp.md)|[typeid](typeid-operator.md)|
56+
|[typeid](../windows/typeid-cpp-component-extensions.md)|[typename](typename.md)|[union](unions.md)|[unsigned](fundamental-types-cpp.md)|
57+
|[using](using-declaration.md) declaration|[using](namespaces-cpp.md#using_directives) directive|[uuid](uuid-cpp.md) <sup>1</sup>|[value class](../windows/classes-and-structs-cpp-component-extensions.md)|
58+
|[value struct](../windows/classes-and-structs-cpp-component-extensions.md)|[virtual](virtual-cpp.md)|[void](void-cpp.md)|[volatile](volatile-cpp.md)|
5959
|[while](while-statement-cpp.md)|
6060

61+
6162
1 Extended attributes for the **__declspec** keyword.
6263

6364
2 Applicable to Managed Extensions for C++ only. This syntax is now deprecated.

0 commit comments

Comments
 (0)