Skip to content

Commit 9813e14

Browse files
authored
Merge pull request #1670 from MicrosoftDocs/master
1/23/2019 AM Publish
2 parents 22f7c4a + ad1ae72 commit 9813e14

44 files changed

Lines changed: 3145 additions & 3722 deletions

Some content is hidden

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

‎.openpublishing.redirection.json‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6400,6 +6400,136 @@
64006400
"redirect_url": "/cpp/dotnet/dotnet-programming-with-cpp-cli-visual-cpp",
64016401
"redirect_document_id": false
64026402
},
6403+
{
6404+
"source_path": "docs/dotnet/lock-members.md",
6405+
"redirect_url": "/cpp/dotnet/lock-class",
6406+
"redirect_document_id": false
6407+
},
6408+
{
6409+
"source_path": "docs/dotnet/lock-lock.md",
6410+
"redirect_url": "/cpp/dotnet/lock-class#lock",
6411+
"redirect_document_id": false
6412+
},
6413+
{
6414+
"source_path": "docs/dotnet/lock-tilde-lock.md",
6415+
"redirect_url": "/cpp/dotnet/lock-class#tilde-lock",
6416+
"redirect_document_id": false
6417+
},
6418+
{
6419+
"source_path": "docs/dotnet/lock-is-locked.md",
6420+
"redirect_url": "/cpp/dotnet/lock-class#is-locked",
6421+
"redirect_document_id": false
6422+
},
6423+
{
6424+
"source_path": "docs/dotnet/lock-operator-bool.md",
6425+
"redirect_url": "/cpp/dotnet/lock-class#operator-bool",
6426+
"redirect_document_id": false
6427+
},
6428+
{
6429+
"source_path": "docs/dotnet/lock-acquire.md",
6430+
"redirect_url": "/cpp/dotnet/lock-class#acquire",
6431+
"redirect_document_id": false
6432+
},
6433+
{
6434+
"source_path": "docs/dotnet/lock-try-acquire.md",
6435+
"redirect_url": "/cpp/dotnet/lock-class#try-acquire",
6436+
"redirect_document_id": false
6437+
},
6438+
{
6439+
"source_path": "docs/dotnet/lock-release.md",
6440+
"redirect_url": "/cpp/dotnet/lock-class#release",
6441+
"redirect_document_id": false
6442+
},
6443+
{
6444+
"source_path": "docs/dotnet/lock-operator-equality.md",
6445+
"redirect_url": "/cpp/dotnet/lock-class#operator-equality",
6446+
"redirect_document_id": false
6447+
},
6448+
{
6449+
"source_path": "docs/dotnet/lock-operator-inequality.md",
6450+
"redirect_url": "/cpp/dotnet/lock-class#operator-inequality",
6451+
"redirect_document_id": false
6452+
},
6453+
{
6454+
"source_path": "docs/dotnet/marshal-context-marshal-context.md",
6455+
"redirect_url": "/cpp/dotnet/marshal-context-class#marshal-context",
6456+
"redirect_document_id": false
6457+
},
6458+
{
6459+
"source_path": "docs/dotnet/marshal-context-tilde-marshal-context.md",
6460+
"redirect_url": "/cpp/dotnet/marshal-context-class#tilde-marshal-context",
6461+
"redirect_document_id": false
6462+
},
6463+
{
6464+
"source_path": "docs/dotnet/marshal-context-marshal-as.md",
6465+
"redirect_url": "/cpp/dotnet/marshal-context-class#marshal-as",
6466+
"redirect_document_id": false
6467+
},
6468+
{
6469+
"source_path": "docs/dotnet/ptr-members.md",
6470+
"redirect_url": "/cpp/dotnet/com-ptr-class",
6471+
"redirect_document_id": false
6472+
},
6473+
{
6474+
"source_path": "docs/dotnet/ptr-ptr.md",
6475+
"redirect_url": "/cpp/dotnet/com-ptr-class#ptr",
6476+
"redirect_document_id": false
6477+
},
6478+
{
6479+
"source_path": "docs/dotnet/ptr-tilde-ptr.md",
6480+
"redirect_url": "/cpp/dotnet/com-ptr-class#tilde-ptr",
6481+
"redirect_document_id": false
6482+
},
6483+
{
6484+
"source_path": "docs/dotnet/ptr-attach.md",
6485+
"redirect_url": "/cpp/dotnet/com-ptr-class#attach",
6486+
"redirect_document_id": false
6487+
},
6488+
{
6489+
"source_path": "docs/dotnet/ptr-createinstance.md",
6490+
"redirect_url": "/cpp/dotnet/com-ptr-class#createInstance",
6491+
"redirect_document_id": false
6492+
},
6493+
{
6494+
"source_path": "docs/dotnet/ptr-detach.md",
6495+
"redirect_url": "/cpp/dotnet/com-ptr-class#detach",
6496+
"redirect_document_id": false
6497+
},
6498+
{
6499+
"source_path": "docs/dotnet/ptr-getinterface.md",
6500+
"redirect_url": "/cpp/dotnet/com-ptr-class#getInterface",
6501+
"redirect_document_id": false
6502+
},
6503+
{
6504+
"source_path": "docs/dotnet/ptr-queryinterface.md",
6505+
"redirect_url": "/cpp/dotnet/com-ptr-class#queryInterface",
6506+
"redirect_document_id": false
6507+
},
6508+
{
6509+
"source_path": "docs/dotnet/ptr-release.md",
6510+
"redirect_url": "/cpp/dotnet/com-ptr-class#release",
6511+
"redirect_document_id": false
6512+
},
6513+
{
6514+
"source_path": "docs/dotnet/ptr-operator-assign.md",
6515+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-assign",
6516+
"redirect_document_id": false
6517+
},
6518+
{
6519+
"source_path": "docs/dotnet/ptr-operator-arrow.md",
6520+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-arrow",
6521+
"redirect_document_id": false
6522+
},
6523+
{
6524+
"source_path": "docs/dotnet/ptr-operator-logical-not.md",
6525+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-logical-not",
6526+
"redirect_document_id": false
6527+
},
6528+
{
6529+
"source_path": "docs/dotnet/ptr-operator-bool.md",
6530+
"redirect_url": "/cpp/dotnet/com-ptr-class#operator-bool",
6531+
"redirect_document_id": false
6532+
},
64036533
{
64046534
"source_path": "docs/error-messages/compiler-errors-1/index.md",
64056535
"redirect_url": "/cpp/error-messages/compiler-errors-1/compiler-fatal-errors-c999-through-c1999",
@@ -9260,6 +9390,66 @@
92609390
"redirect_url": "/cpp/windows/desktop-applications-visual-cpp",
92619391
"redirect_document_id": true
92629392
},
9393+
{
9394+
"source_path": "docs/dotnet/auto-handle-auto-handle.md",
9395+
"redirect_url": "/cpp/dotnet/auto-handle-class#auto-handle",
9396+
"redirect_document_id": true
9397+
},
9398+
{
9399+
"source_path": "docs/dotnet/auto-handle-tilde-auto-handle.md",
9400+
"redirect_url": "/cpp/dotnet/auto-handle-class#tilde-auto-handle",
9401+
"redirect_document_id": true
9402+
},
9403+
{
9404+
"source_path": "docs/dotnet/auto-handle-members.md",
9405+
"redirect_url": "/cpp/dotnet/auto-handle-class#members",
9406+
"redirect_document_id": true
9407+
},
9408+
{
9409+
"source_path": "docs/dotnet/auto-handle-get.md",
9410+
"redirect_url": "/cpp/dotnet/auto-handle-class#get",
9411+
"redirect_document_id": true
9412+
},
9413+
{
9414+
"source_path": "docs/dotnet/auto-handle-operator-arrow.md",
9415+
"redirect_url": "/cpp/dotnet/auto-handle-class#operator-arrow",
9416+
"redirect_document_id": true
9417+
},
9418+
{
9419+
"source_path": "docs/dotnet/auto-handle-operator-assign.md",
9420+
"redirect_url": "/cpp/dotnet/auto-handle-class#operator-assign",
9421+
"redirect_document_id": true
9422+
},
9423+
{
9424+
"source_path": "docs/dotnet/auto-handle-operator-auto-handle.md",
9425+
"redirect_url": "/cpp/dotnet/auto-handle-class#operator-auto-handle",
9426+
"redirect_document_id": true
9427+
},
9428+
{
9429+
"source_path": "docs/dotnet/auto-handle-operator-bool.md",
9430+
"redirect_url": "/cpp/dotnet/auto-handle-class#operator-bool",
9431+
"redirect_document_id": true
9432+
},
9433+
{
9434+
"source_path": "docs/dotnet/auto-handle-operator-logical-not.md",
9435+
"redirect_url": "/cpp/dotnet/auto-handle-class#operator-logical-not",
9436+
"redirect_document_id": true
9437+
},
9438+
{
9439+
"source_path": "docs/dotnet/auto-handle-release.md",
9440+
"redirect_url": "/cpp/dotnet/auto-handle-class#release",
9441+
"redirect_document_id": true
9442+
},
9443+
{
9444+
"source_path": "docs/dotnet/auto-handle-reset.md",
9445+
"redirect_url": "/cpp/dotnet/auto-handle-class#reset",
9446+
"redirect_document_id": true
9447+
},
9448+
{
9449+
"source_path": "docs/dotnet/auto-handle-swap.md",
9450+
"redirect_url": "/cpp/dotnet/auto-handle-class#swap",
9451+
"redirect_document_id": true
9452+
},
92639453
{
92649454
"source_path": "docs/windows/activatableclass-macros.md",
92659455
"redirect_url": "/cpp/windows/wrl/activatableclass-macros",
@@ -9900,5 +10090,6 @@
990010090
"redirect_url": "/cpp/parallel/openmp/c-openmp-c-and-cpp-grammar#c2-rules",
990110091
"redirect_document_id": false
990210092
}
10093+
990310094
]
990410095
}

‎docs/dotnet/TOC.md‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@
120120
### [Overview of Marshaling in C++](overview-of-marshaling-in-cpp.md)
121121
#### [marshal_as](marshal-as.md)
122122
#### [marshal_context Class](marshal-context-class.md)
123-
##### [marshal_context::marshal_context](marshal-context-marshal-context.md)
124-
##### [marshal_context::~marshal_context](marshal-context-tilde-marshal-context.md)
125-
##### [marshal_context::marshal_as](marshal-context-marshal-as.md)
126123
### [msclr namespace](msclr-namespace.md)
127124
### [Resource Management Classes](resource-management-classes.md)
128125
#### [auto_gcroot](auto-gcroot.md)
@@ -143,50 +140,15 @@
143140
##### [swap Function (auto_gcroot)](swap-function-auto-gcroot.md)
144141
#### [auto_handle](auto-handle.md)
145142
##### [auto_handle Class](auto-handle-class.md)
146-
###### [auto_handle Members](auto-handle-members.md)
147-
###### [auto_handle::auto_handle](auto-handle-auto-handle.md)
148-
###### [auto_handle::~auto_handle](auto-handle-tilde-auto-handle.md)
149-
###### [auto_handle::get](auto-handle-get.md)
150-
###### [auto_handle::release](auto-handle-release.md)
151-
###### [auto_handle::reset](auto-handle-reset.md)
152-
###### [auto_handle::swap](auto-handle-swap.md)
153-
###### [auto_handle::operator=](auto-handle-operator-assign.md)
154-
###### [auto_handle::operator->](auto-handle-operator-arrow.md)
155-
###### [auto_handle::operator!](auto-handle-operator-logical-not.md)
156-
###### [auto_handle::operator auto_handle](auto-handle-operator-auto-handle.md)
157-
###### [auto_handle::operator bool](auto-handle-operator-bool.md)
158143
##### [swap Function (auto_handle)](swap-function-auto-handle.md)
159144
### [Synchronization (lock Class)](synchronization-lock-class.md)
160145
#### [lock](lock.md)
161146
##### [lock Class](lock-class.md)
162-
###### [lock Members](lock-members.md)
163-
###### [lock::lock](lock-lock.md)
164-
###### [lock::~lock](lock-tilde-lock.md)
165-
###### [lock::is_locked](lock-is-locked.md)
166-
###### [lock::operator bool](lock-operator-bool.md)
167-
###### [lock::acquire](lock-acquire.md)
168-
###### [lock::try_acquire](lock-try-acquire.md)
169-
###### [lock::release](lock-release.md)
170-
###### [lock::operator==](lock-operator-equality.md)
171-
###### [lock::operator!=](lock-operator-inequality.md)
172147
##### [lock_when Enum](lock-when-enum.md)
173148
### [Calling Functions in a Specific Application Domain](calling-functions-in-a-specific-application-domain.md)
174149
#### [call_in_appdomain Function](call-in-appdomain-function.md)
175150
### [com::ptr](com-ptr.md)
176151
#### [com::ptr Class](com-ptr-class.md)
177-
##### [ptr Members](ptr-members.md)
178-
##### [ptr::ptr](ptr-ptr.md)
179-
##### [ptr::~ptr](ptr-tilde-ptr.md)
180-
##### [ptr::Attach](ptr-attach.md)
181-
##### [ptr::CreateInstance](ptr-createinstance.md)
182-
##### [ptr::Detach](ptr-detach.md)
183-
##### [ptr::GetInterface](ptr-getinterface.md)
184-
##### [ptr::QueryInterface](ptr-queryinterface.md)
185-
##### [ptr::Release](ptr-release.md)
186-
##### [ptr::operator=](ptr-operator-assign.md)
187-
##### [ptr::operator->](ptr-operator-arrow.md)
188-
##### [ptr::operator!](ptr-operator-logical-not.md)
189-
##### [ptr::operator bool](ptr-operator-bool.md)
190152
## [Exceptions in C++/CLI](exceptions-in-cpp-cli.md)
191153
### [Basic Concepts in Using Managed Exceptions](basic-concepts-in-using-managed-exceptions.md)
192154
### [Differences in Exception Handling Behavior Under -CLR](differences-in-exception-handling-behavior-under-clr.md)

‎docs/dotnet/auto-handle-auto-handle.md‎

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

0 commit comments

Comments
 (0)