Skip to content

Commit aab7ba9

Browse files
Ja-DunnJa-Dunn
authored
Merge pull request #1429 from DennisLee-DennisLee/1338191-v-dele-ComPtr
1338191: Consolidated the ComPtr class in the Microsoft::WRL namespace.
2 parents a7c22ea + 0c6aa57 commit aab7ba9

25 files changed

+635
-1098
lines changed

‎.openpublishing.redirection.json‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6630,6 +6630,116 @@
66306630
"redirect_url": "/cpp/windows/classfactory-class#release",
66316631
"redirect_document_id": false
66326632
},
6633+
{
6634+
"source_path": "docs/windows/comptr-tilde-comptr-destructor.md",
6635+
"redirect_url": "/cpp/windows/comptr-class#tilde-comptr",
6636+
"redirect_document_id": false
6637+
},
6638+
{
6639+
"source_path": "docs/windows/comptr-as-method.md",
6640+
"redirect_url": "/cpp/windows/comptr-class#as",
6641+
"redirect_document_id": false
6642+
},
6643+
{
6644+
"source_path": "docs/windows/comptr-asiid-method.md",
6645+
"redirect_url": "/cpp/windows/comptr-class#asiid",
6646+
"redirect_document_id": false
6647+
},
6648+
{
6649+
"source_path": "docs/windows/comptr-asweak-method.md",
6650+
"redirect_url": "/cpp/windows/comptr-class#asweak",
6651+
"redirect_document_id": false
6652+
},
6653+
{
6654+
"source_path": "docs/windows/comptr-attach-method.md",
6655+
"redirect_url": "/cpp/windows/comptr-class#attach",
6656+
"redirect_document_id": false
6657+
},
6658+
{
6659+
"source_path": "docs/windows/comptr-comptr-constructor.md",
6660+
"redirect_url": "/cpp/windows/comptr-class#comptr",
6661+
"redirect_document_id": false
6662+
},
6663+
{
6664+
"source_path": "docs/windows/comptr-copyto-method.md",
6665+
"redirect_url": "/cpp/windows/comptr-class#copyto",
6666+
"redirect_document_id": false
6667+
},
6668+
{
6669+
"source_path": "docs/windows/comptr-detach-method.md",
6670+
"redirect_url": "/cpp/windows/comptr-class#detach",
6671+
"redirect_document_id": false
6672+
},
6673+
{
6674+
"source_path": "docs/windows/comptr-get-method.md",
6675+
"redirect_url": "/cpp/windows/comptr-class#get",
6676+
"redirect_document_id": false
6677+
},
6678+
{
6679+
"source_path": "docs/windows/comptr-getaddressof-method.md",
6680+
"redirect_url": "/cpp/windows/comptr-class#getaddressof",
6681+
"redirect_document_id": false
6682+
},
6683+
{
6684+
"source_path": "docs/windows/comptr-internaladdref-method.md",
6685+
"redirect_url": "/cpp/windows/comptr-class#internaladdref",
6686+
"redirect_document_id": false
6687+
},
6688+
{
6689+
"source_path": "docs/windows/comptr-internalrelease-method.md",
6690+
"redirect_url": "/cpp/windows/comptr-class#internalrelease",
6691+
"redirect_document_id": false
6692+
},
6693+
{
6694+
"source_path": "docs/windows/comptr-operator-microsoft-wrl-details-booltype-operator.md",
6695+
"redirect_url": "/cpp/windows/comptr-class#operator-microsoft-wrl-details-booltype",
6696+
"redirect_document_id": false
6697+
},
6698+
{
6699+
"source_path": "docs/windows/comptr-operator-ampersand-operator.md",
6700+
"redirect_url": "/cpp/windows/comptr-class#operator-ampersand",
6701+
"redirect_document_id": false
6702+
},
6703+
{
6704+
"source_path": "docs/windows/comptr-operator-assign-operator.md",
6705+
"redirect_url": "/cpp/windows/comptr-class#operator-assign",
6706+
"redirect_document_id": false
6707+
},
6708+
{
6709+
"source_path": "docs/windows/comptr-operator-arrow-operator.md",
6710+
"redirect_url": "/cpp/windows/comptr-class#operator-arrow",
6711+
"redirect_document_id": false
6712+
},
6713+
{
6714+
"source_path": "docs/windows/comptr-ptr-data-member.md",
6715+
"redirect_url": "/cpp/windows/comptr-class#ptr",
6716+
"redirect_document_id": false
6717+
},
6718+
{
6719+
"source_path": "docs/windows/comptr-releaseandgetaddressof-method.md",
6720+
"redirect_url": "/cpp/windows/comptr-class#releaseandgetaddressof",
6721+
"redirect_document_id": false
6722+
},
6723+
{
6724+
"source_path": "docs/windows/comptr-reset.md",
6725+
"redirect_url": "/cpp/windows/comptr-class#reset",
6726+
"redirect_document_id": false
6727+
},
6728+
{
6729+
"source_path": "docs/windows/comptr-swap-method.md",
6730+
"redirect_url": "/cpp/windows/comptr-class#swap",
6731+
"redirect_document_id": false
6732+
},
6733+
{
6734+
"source_path": "docs/windows/comptr-operator-equality-operator.md",
6735+
"redirect_url": "/cpp/windows/comptr-class#operator-equality",
6736+
"redirect_document_id": false
6737+
},
6738+
{
6739+
"source_path": "docs/windows/comptr-operator-inequality-operator.md",
6740+
"redirect_url": "/cpp/windows/comptr-class#operator-inequality",
6741+
"redirect_document_id": false
6742+
},
66336743
{
66346744
"source_path": "docs/windows/comptrref-comptrref-constructor.md",
66356745
"redirect_url": "/cpp/windows/comptrref-class#comptrref",

‎docs/windows/TOC.md‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -306,28 +306,6 @@
306306
##### [CloakedIid Structure](cloakediid-structure.md)
307307
##### [ComposableBase Class](composablebase-class.md)
308308
##### [ComPtr Class](comptr-class.md)
309-
###### [ComPtr::~ComPtr Destructor](comptr-tilde-comptr-destructor.md)
310-
###### [ComPtr::As Method](comptr-as-method.md)
311-
###### [ComPtr::AsIID Method](comptr-asiid-method.md)
312-
###### [ComPtr::AsWeak Method](comptr-asweak-method.md)
313-
###### [ComPtr::Attach Method](comptr-attach-method.md)
314-
###### [ComPtr::ComPtr Constructor](comptr-comptr-constructor.md)
315-
###### [ComPtr::CopyTo Method](comptr-copyto-method.md)
316-
###### [ComPtr::Detach Method](comptr-detach-method.md)
317-
###### [ComPtr::Get Method](comptr-get-method.md)
318-
###### [ComPtr::GetAddressOf Method](comptr-getaddressof-method.md)
319-
###### [ComPtr::InternalAddRef Method](comptr-internaladdref-method.md)
320-
###### [ComPtr::InternalRelease Method](comptr-internalrelease-method.md)
321-
###### [ComPtr::operator Microsoft::WRL::Details::BoolType Operator](comptr-operator-microsoft-wrl-details-booltype-operator.md)
322-
###### [ComPtr::operator& Operator](comptr-operator-ampersand-operator.md)
323-
###### [ComPtr::operator= Operator](comptr-operator-assign-operator.md)
324-
###### [ComPtr::operator-> Operator](comptr-operator-arrow-operator.md)
325-
###### [ComPtr::ptr_ Data Member](comptr-ptr-data-member.md)
326-
###### [ComPtr::ReleaseAndGetAddressOf Method](comptr-releaseandgetaddressof-method.md)
327-
###### [ComPtr::Reset](comptr-reset.md)
328-
###### [ComPtr::Swap Method](comptr-swap-method.md)
329-
###### [ComPtr::operator== Operator](comptr-operator-equality-operator.md)
330-
###### [ComPtr::operator!= Operator](comptr-operator-inequality-operator.md)
331309
##### [CreateActivationFactory Function](createactivationfactory-function.md)
332310
##### [CreateClassFactory Function](createclassfactory-function.md)
333311
##### [DeferrableEventArgs Class](deferrableeventargs-class.md)

‎docs/windows/comptr-as-method.md‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎docs/windows/comptr-asiid-method.md‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎docs/windows/comptr-asweak-method.md‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎docs/windows/comptr-attach-method.md‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)