Skip to content

Commit 5c08c90

Browse files
author
Colin Robertson
authored
Merge pull request #1390 from MicrosoftDocs/DennisLee-DennisLee-v-dele-1338191-Module
Fix merge conflict in consolidated module class
2 parents b92c3cf + f87d977 commit 5c08c90

35 files changed

+683
-1309
lines changed

‎.openpublishing.redirection.json

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6550,6 +6550,151 @@
65506550
"redirect_url": "/cpp/windows/implements-structure#iidcount",
65516551
"redirect_document_id": false
65526552
},
6553+
{
6554+
"source_path": "docs/windows/module-tilde-module-destructor.md",
6555+
"redirect_url": "/cpp/windows/module-class#tilde-module",
6556+
"redirect_document_id": false
6557+
},
6558+
{
6559+
"source_path": "docs/windows/module-create-method.md",
6560+
"redirect_url": "/cpp/windows/module-class#create",
6561+
"redirect_document_id": false
6562+
},
6563+
{
6564+
"source_path": "docs/windows/module-decrementobjectcount-method.md",
6565+
"redirect_url": "/cpp/windows/module-class#decrementobjectcount",
6566+
"redirect_document_id": false
6567+
},
6568+
{
6569+
"source_path": "docs/windows/module-getactivationfactory-method.md",
6570+
"redirect_url": "/cpp/windows/module-class#getactivationfactory",
6571+
"redirect_document_id": false
6572+
},
6573+
{
6574+
"source_path": "docs/windows/module-getclassobject-method.md",
6575+
"redirect_url": "/cpp/windows/module-class#getclassobject",
6576+
"redirect_document_id": false
6577+
},
6578+
{
6579+
"source_path": "docs/windows/module-getmodule-method.md",
6580+
"redirect_url": "/cpp/windows/module-class#getmodule",
6581+
"redirect_document_id": false
6582+
},
6583+
{
6584+
"source_path": "docs/windows/module-getobjectcount-method.md",
6585+
"redirect_url": "/cpp/windows/module-class#getobjectcount",
6586+
"redirect_document_id": false
6587+
},
6588+
{
6589+
"source_path": "docs/windows/module-incrementobjectcount-method.md",
6590+
"redirect_url": "/cpp/windows/module-class#incrementobjectcount",
6591+
"redirect_document_id": false
6592+
},
6593+
{
6594+
"source_path": "docs/windows/module-module-constructor.md",
6595+
"redirect_url": "/cpp/windows/module-class#module",
6596+
"redirect_document_id": false
6597+
},
6598+
{
6599+
"source_path": "docs/windows/module-objectcount-data-member.md",
6600+
"redirect_url": "/cpp/windows/module-class#objectcount",
6601+
"redirect_document_id": false
6602+
},
6603+
{
6604+
"source_path": "docs/windows/module-registercomobject-method.md",
6605+
"redirect_url": "/cpp/windows/module-class#registercomobject",
6606+
"redirect_document_id": false
6607+
},
6608+
{
6609+
"source_path": "docs/windows/module-registerobjects-method.md",
6610+
"redirect_url": "/cpp/windows/module-class#registerobjects",
6611+
"redirect_document_id": false
6612+
},
6613+
{
6614+
"source_path": "docs/windows/module-registerwinrtobject-method.md",
6615+
"redirect_url": "/cpp/windows/module-class#registerwinrtobject",
6616+
"redirect_document_id": false
6617+
},
6618+
{
6619+
"source_path": "docs/windows/module-releasenotifier-data-member.md",
6620+
"redirect_url": "/cpp/windows/module-class#releasenotifier",
6621+
"redirect_document_id": false
6622+
},
6623+
{
6624+
"source_path": "docs/windows/module-terminate-method.md",
6625+
"redirect_url": "/cpp/windows/module-class#terminate",
6626+
"redirect_document_id": false
6627+
},
6628+
{
6629+
"source_path": "docs/windows/module-unregistercomobject-method.md",
6630+
"redirect_url": "/cpp/windows/module-class#unregistercomobject",
6631+
"redirect_document_id": false
6632+
},
6633+
{
6634+
"source_path": "docs/windows/module-unregisterobjects-method.md",
6635+
"redirect_url": "/cpp/windows/module-class#unregisterobjects",
6636+
"redirect_document_id": false
6637+
},
6638+
{
6639+
"source_path": "docs/windows/module-unregisterwinrtobject-method.md",
6640+
"redirect_url": "/cpp/windows/module-class#unregisterwinrtobject",
6641+
"redirect_document_id": false
6642+
},
6643+
{
6644+
"source_path": "docs/windows/module-genericreleasenotifier-callback-data-member.md",
6645+
"redirect_url": "/cpp/windows/module-genericreleasenotifier-class#genericreleasenotifier-callback",
6646+
"redirect_document_id": false
6647+
},
6648+
{
6649+
"source_path": "docs/windows/module-genericreleasenotifier-genericreleasenotifier-constructor.md",
6650+
"redirect_url": "/cpp/windows/module-genericreleasenotifier-class#genericreleasenotifier-genericreleasenotifier",
6651+
"redirect_document_id": false
6652+
},
6653+
{
6654+
"source_path": "docs/windows/module-genericreleasenotifier-invoke-method.md",
6655+
"redirect_url": "/cpp/windows/module-genericreleasenotifier-class#genericreleasenotifier-invoke",
6656+
"redirect_document_id": false
6657+
},
6658+
{
6659+
"source_path": "docs/windows/module-methodreleasenotifier-invoke-method.md",
6660+
"redirect_url": "/cpp/windows/module-methodreleasenotifier-class#methodreleasenotifier-invoke",
6661+
"redirect_document_id": false
6662+
},
6663+
{
6664+
"source_path": "docs/windows/module-methodreleasenotifier-method-data-member.md",
6665+
"redirect_url": "/cpp/windows/module-methodreleasenotifier-class#methodreleasenotifier-method",
6666+
"redirect_document_id": false
6667+
},
6668+
{
6669+
"source_path": "docs/windows/module-methodreleasenotifier-methodreleasenotifier-constructor.md",
6670+
"redirect_url": "/cpp/windows/module-methodreleasenotifier-class#methodreleasenotifier-methodreleasenotifier",
6671+
"redirect_document_id": false
6672+
},
6673+
{
6674+
"source_path": "docs/windows/module-methodreleasenotifier-object-data-member.md",
6675+
"redirect_url": "/cpp/windows/module-methodreleasenotifier-class#methodreleasenotifier-object",
6676+
"redirect_document_id": false
6677+
},
6678+
{
6679+
"source_path": "docs/windows/module-releasenotifier-invoke-method.md",
6680+
"redirect_url": "/cpp/windows/module-releasenotifier-class#releasenotifier-invoke",
6681+
"redirect_document_id": false
6682+
},
6683+
{
6684+
"source_path": "docs/windows/module-releasenotifier-release.md",
6685+
"redirect_url": "/cpp/windows/module-releasenotifier-class#releasenotifier-release",
6686+
"redirect_document_id": false
6687+
},
6688+
{
6689+
"source_path": "docs/windows/module-releasenotifier-releasenotifier-constructor.md",
6690+
"redirect_url": "/cpp/windows/module-releasenotifier-class#releasenotifier-releasenotifier",
6691+
"redirect_document_id": false
6692+
},
6693+
{
6694+
"source_path": "docs/windows/module-releasenotifier-tilde-releasenotifier-destructor.md",
6695+
"redirect_url": "/cpp/windows/module-releasenotifier-class#releasenotifier-tilde-releasenotifier",
6696+
"redirect_document_id": false
6697+
},
65536698
{
65546699
"source_path": "docs/windows/runtimeclass-tilde-runtimeclass-destructor.md",
65556700
"redirect_url": "/cpp/windows/runtimeclass-class#tilde-runtimeclass",

‎docs/windows/TOC.md

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -377,38 +377,9 @@
377377
##### [Make Function](make-function.md)
378378
##### [MixIn Structure](mixin-structure.md)
379379
##### [Module Class](module-class.md)
380-
###### [Module::~Module Destructor](module-tilde-module-destructor.md)
381-
###### [Module::Create Method](module-create-method.md)
382-
###### [Module::DecrementObjectCount Method](module-decrementobjectcount-method.md)
383380
###### [Module::GenericReleaseNotifier Class](module-genericreleasenotifier-class.md)
384-
####### [Module::GenericReleaseNotifier::callback_ Data Member](module-genericreleasenotifier-callback-data-member.md)
385-
####### [Module::GenericReleaseNotifier::GenericReleaseNotifier Constructor](module-genericreleasenotifier-genericreleasenotifier-constructor.md)
386-
####### [Module::GenericReleaseNotifier::Invoke Method](module-genericreleasenotifier-invoke-method.md)
387-
###### [Module::GetActivationFactory Method](module-getactivationfactory-method.md)
388-
###### [Module::GetClassObject Method](module-getclassobject-method.md)
389-
###### [Module::GetModule Method](module-getmodule-method.md)
390-
###### [Module::GetObjectCount Method](module-getobjectcount-method.md)
391-
###### [Module::IncrementObjectCount Method](module-incrementobjectcount-method.md)
392381
###### [Module::MethodReleaseNotifier Class](module-methodreleasenotifier-class.md)
393-
####### [Module::MethodReleaseNotifier::Invoke Method](module-methodreleasenotifier-invoke-method.md)
394-
####### [Module::MethodReleaseNotifier::method_ Data Member](module-methodreleasenotifier-method-data-member.md)
395-
####### [Module::MethodReleaseNotifier::MethodReleaseNotifier Constructor](module-methodreleasenotifier-methodreleasenotifier-constructor.md)
396-
####### [Module::MethodReleaseNotifier::object_ Data Member](module-methodreleasenotifier-object-data-member.md)
397-
###### [Module::Module Constructor](module-module-constructor.md)
398-
###### [Module::objectCount_ Data Member](module-objectcount-data-member.md)
399-
###### [Module::RegisterCOMObject Method](module-registercomobject-method.md)
400-
###### [Module::RegisterObjects Method](module-registerobjects-method.md)
401-
###### [Module::RegisterWinRTObject Method](module-registerwinrtobject-method.md)
402382
###### [Module::ReleaseNotifier Class](module-releasenotifier-class.md)
403-
####### [Module::ReleaseNotifier::~ReleaseNotifier Destructor](module-releasenotifier-tilde-releasenotifier-destructor.md)
404-
####### [Module::ReleaseNotifier::Invoke Method](module-releasenotifier-invoke-method.md)
405-
####### [Module::releaseNotifier_ Data Member](module-releasenotifier-data-member.md)
406-
####### [Module::ReleaseNotifier::ReleaseNotifier Constructor](module-releasenotifier-releasenotifier-constructor.md)
407-
####### [Module::ReleaseNotifier::Release](module-releasenotifier-release.md)
408-
###### [Module::Terminate Method](module-terminate-method.md)
409-
###### [Module::UnregisterCOMObject Method](module-unregistercomobject-method.md)
410-
###### [Module::UnregisterObjects Method](module-unregisterobjects-method.md)
411-
###### [Module::UnregisterWinRTObject Method](module-unregisterwinrtobject-method.md)
412383
##### [ModuleType Enumeration](moduletype-enumeration.md)
413384
##### [operator!= Operator (Microsoft::WRL)](operator-inequality-operator-microsoft-wrl.md)
414385
##### [operator== Operator (Microsoft::WRL)](operator-equality-operator-microsoft-wrl.md)

0 commit comments

Comments
 (0)