Skip to content

Commit b04b32a

Browse files
author
mikeblome
committed
more manual fixes
1 parent ad9c653 commit b04b32a

34 files changed

+53
-56
lines changed

docs/parallel/amp/cpp-amp-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ C++ AMP includes a graphics library that is designed for accelerated graphics pr
450450

451451
- [writeonly_texture_view Class](../../parallel/amp/reference/writeonly-texture-view-class.md): Provides write-only access to any texture.
452452

453-
- [Short Vector Library](https://msdn.microsoft.com/4c4f5bed-c396-493b-a238-c347563f645f): Defines a set of short vector types of length 2, 3, and 4 that are based on **int**, `uint`, **float**, **double**, [norm](../../parallel/amp/reference/norm-class.md), or [unorm](../../parallel/amp/reference/unorm-class.md).
453+
- Short Vector Library: Defines a set of short vector types of length 2, 3, and 4 that are based on **int**, `uint`, **float**, **double**, [norm](../../parallel/amp/reference/norm-class.md), or [unorm](../../parallel/amp/reference/unorm-class.md).
454454

455455
## Universal Windows Platform (UWP) Apps
456456

docs/parallel/amp/reference/concurrency-direct3d-namespace-functions-amp.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ ms.workload: ["cplusplus"]
1414
||||
1515
|-|-|-|
1616
|[abs](#abs)|[clamp](#clamp)|[countbits](#countbits)|
17-
|[create_accelerator_view](#create_accelerator_view)|||
18-
|[d3d_access_lock](#d3d_access_lock)|[d3d_access_try_lock](#d3d_access_try_lock)|[d3d_access_unlock](#d3d_access_unlock)|
19-
|[firstbithigh](#firstbithigh)|[firstbitlow](#firstbitlow)|[get_buffer](#get_buffer)|
17+
|[create_accelerator_view](#create_accelerator_view)|[d3d_access_lock](#d3d_access_lock)||
18+
|[d3d_access_try_lock](#d3d_access_try_lock)|[d3d_access_unlock](#d3d_access_unlock)|[firstbithigh](#firstbithigh)|
19+
|[firstbitlow](#firstbitlow)|[get_buffer](#get_buffer)|[get_device](#get_device)|
2020
|[imax](#imax)|[imin](#imin)|[is_timeout_disabled](#is_timeout_disabled)|
2121
|[mad](#mad)|[make_array](#make_array)|[noise](#noise)|
2222
|[radians](#radians)|[rcp](#rcp)|[reversebits](#reversebits)|
@@ -212,7 +212,21 @@ IUnknown *get_buffer(
212212

213213
### Return Value
214214
The IUnknown interface pointer corresponding to the Direct3D buffer underlying the array.
215-
215+
216+
## <a name="get_device"></a> get_device
217+
Get the D3D device interface underlying a accelerator_view.
218+
219+
```
220+
IUnknown* get_device(const accelerator_view &Av);
221+
```
222+
223+
### Parameters
224+
`Av`
225+
The D3D `accelerator_view` for which the underlying D3D device interface is returned.
226+
227+
### Return Value
228+
The `IUnknown` interface pointer of the D3D device underlying the `accelerator_view`.
229+
216230
## <a name="imax"></a> imax
217231
Determine the maximum numeric value of the arguments
218232

docs/parallel/amp/reference/tiled-index-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class tiled_index<_Dim0, 0, 0> : public _Tiled_index_base<1>;
7070
|----------|-----------------|
7171
|[barrier Constant](#tiled_index__barrier)|Stores a [tile_barrier](tile-barrier-class.md) object that represents a barrier in the current tile of threads.|
7272
|||
73-
|[global Constant](#tiled_index__global)|Stores an [index](index-class.md) object of rank 1, 2, or 3 that represents the global index in a [grid](https://msdn.microsoft.com/f7d1b6a6-586c-4345-b09a-bfc26c492cb0) object.|
73+
|[global Constant](#tiled_index__global)|Stores an [index](index-class.md) object of rank 1, 2, or 3 that represents the global index in a grid object.|
7474
|[local Constant](#tiled_index__local)|Stores an `index` object of rank 1, 2, or 3 that represents the relative index in the current tile of a [tiled_extent](tiled-extent-class.md) object.|
7575
|[rank Constant](#tiled_index__rank)|Stores the rank of the `tiled_index` object.|
7676
|[tile Constant](#tiled_index__tile)|Stores an `index` object of rank 1, 2, or 3 that represents the coordinates of the current tile of a `tiled_extent` object.|

docs/parallel/amp/using-accelerator-and-accelerator-view-objects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ The device paths of three special accelerators are available as properties of th
175175

176176
## Interoperability
177177

178-
The C++ AMP runtime supports interoperability between the `accelerator_view` class and the Direct3D [ID3D11Device interface](http://go.microsoft.com/fwlink/p/?linkId=248488). The [create_accelerator_view](reference/concurrency-direct3d-namespace-functions-amp.md#create_accelerator_view) method takes an `IUnknown` interface and returns an `accelerator_view` object. The [get_device](https://msdn.microsoft.com/8194125e-8396-4d62-aa8a-65831dea8439) method takes an `accelerator_view` object and returns an `IUknown` interface.
178+
The C++ AMP runtime supports interoperability between the `accelerator_view` class and the Direct3D [ID3D11Device interface](http://go.microsoft.com/fwlink/p/?linkId=248488). The [create_accelerator_view](reference/concurrency-direct3d-namespace-functions-amp.md#create_accelerator_view) method takes an `IUnknown` interface and returns an `accelerator_view` object. The [get_device](reference/concurrency-direct3d-namespace-functions-amp.md#get_device) method takes an `accelerator_view` object and returns an `IUknown` interface.
179179

180180
## See Also
181181

docs/parallel/concrt/parallel-containers-and-objects.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@ The Parallel Patterns Library (PPL) includes several containers and objects that
174174

175175
|Operator|Description|
176176
|--------------|-----------------|
177-
|[operator++](https://msdn.microsoft.com/4cfdd07e-927a-42f8-aaa0-d6881687f413)|Advances to next item in the queue. This operator is overloaded to provide both pre-increment and post-increment semantics.|
178-
|[operator*](https://msdn.microsoft.com/a0e671fc-76e6-4fb4-b95c-ced4dd2b2017)|Retrieves a reference to the current item.|
179-
|[operator->](https://msdn.microsoft.com/41fa393d-ae1e-4a38-bb4b-19e8df709ca9)|Retrieves a pointer to the current item.|
177+
|`operator++`|Advances to next item in the queue. This operator is overloaded to provide both pre-increment and post-increment semantics.|
178+
|`operator*`|Retrieves a reference to the current item.|
179+
|`operator->`|Retrieves a pointer to the current item.|
180180

181181
[[Top](#top)]
182182

183183
## <a name="unordered_map"></a> concurrent_unordered_map Class
184-
The [HYPERLINK "file:///C:\\\Users\\\thompet\\\AppData\\\Local\\\Temp\\\DxEditor\\\DduePreview\\\Default\\\798d7037-df37-4310-858b-6f590bbf6ebf\\\HTM\\\html\\\a217b4ac-af2b-4d41-94eb-09a75ee28622" concurrency::concurrent_unordered_map](../../parallel/concrt/reference/concurrent-unordered-map-class.md) class is an associative container class that, just like the [std::unordered_map](../../standard-library/unordered-map-class.md) class, controls a varying-length sequence of elements of type [std::pair\<const Key, Ty>](../../standard-library/pair-structure.md). Think of an unordered map as a dictionary that you can add a key and value pair to or look up a value by key. This class is useful when you have multiple threads or tasks that have to concurrently access a shared container, insert into it, or update it.
184+
The [concurrency::concurrent_unordered_map](../../parallel/concrt/reference/concurrent-unordered-map-class.md) class is an associative container class that, just like the [std::unordered_map](../../standard-library/unordered-map-class.md) class, controls a varying-length sequence of elements of type [std::pair\<const Key, Ty>](../../standard-library/pair-structure.md). Think of an unordered map as a dictionary that you can add a key and value pair to or look up a value by key. This class is useful when you have multiple threads or tasks that have to concurrently access a shared container, insert into it, or update it.
185185

186186
The following example shows the basic structure for using `concurrent_unordered_map`. This example inserts character keys in the range ['a', 'i']. Because the order of operations is undetermined, the final value for each key is also undetermined. However, it is safe to perform the insertions in parallel.
187187

docs/parallel/concrt/reference/concurrency-namespace-functions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ IResourceManager* __cdecl CreateResourceManager();
141141
An `IResourceManager` interface.
142142

143143
### Remarks
144-
Multiple subsequent calls to this method will return the same instance of the Resource Manager. Each call to the method increments a reference count on the Resource Manager, and must be matched with a call to the [IResourceManager::Release](https://msdn.microsoft.com/5d1356ec-fbd3-4284-a361-1e9e20bbb522) method when your scheduler is done communicating with the Resource Manager.
144+
Multiple subsequent calls to this method will return the same instance of the Resource Manager. Each call to the method increments a reference count on the Resource Manager, and must be matched with a call to the [IResourceManager::Release](iresourcemanager-structure.md) method when your scheduler is done communicating with the Resource Manager.
145145

146146
[unsupported_os](unsupported-os-class.md) is thrown if the operating system is not supported by the Concurrency Runtime.
147147

148148
## <a name="create_task"></a> create_task
149-
Creates a PPL [task](https://msdn.microsoft.com/5389e8a5-5038-40b6-844a-55e9b58ad35f) object. `create_task` can be used anywhere you would have used a task constructor. It is provided mainly for convenience, because it allows use of the `auto` keyword while creating tasks.
149+
Creates a PPL [task](task-class.md) object. `create_task` can be used anywhere you would have used a task constructor. It is provided mainly for convenience, because it allows use of the `auto` keyword while creating tasks.
150150

151151
```
152152
template<typename T>

docs/parallel/concrt/reference/concurrency-namespace.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ namespace concurrency;
2323

2424
## Members
2525

26-
### Namespaces
27-
28-
|Name|Description|
29-
|----------|-----------------|
30-
|[concurrency::extensibility Namespace](https://msdn.microsoft.com/16a86ff2-128e-4edf-89e4-38aac79c81f9)||
31-
3226
### Typedefs
3327

3428
|Name|Description|
@@ -110,7 +104,7 @@ namespace concurrency;
110104
|[structured_task_group Class](structured-task-group-class.md)|The `structured_task_group` class represents a highly structured collection of parallel work. You can queue individual parallel tasks to a `structured_task_group` using `task_handle` objects, and wait for them to complete, or cancel the task group before they have finished executing, which will abort any tasks that have not begun execution.|
111105
|[target_block Class](target-block-class.md)|The `target_block` class is an abstract base class that provides basic link management functionality and error checking for target only blocks.|
112106
|[task Class (Concurrency Runtime)](task-class.md)|The Parallel Patterns Library (PPL) `task` class. A `task` object represents work that can be executed asynchronously, and concurrently with other tasks and parallel work produced by parallel algorithms in the Concurrency Runtime. It produces a result of type `_ResultType` on successful completion. Tasks of type `task<void>` produce no result. A task can be waited upon and canceled independently of other tasks. It can also be composed with other tasks using continuations(`then`), and join(`when_all`) and choice(`when_any`) patterns.|
113-
|[task_canceled Class](task-canceled-class.md)|This class describes an exception thrown by the PPL tasks layer in order to force the current task to cancel. It is also thrown by the `get()` method on [task](https://msdn.microsoft.com/5389e8a5-5038-40b6-844a-55e9b58ad35f), for a canceled task.|
107+
|[task_canceled Class](task-canceled-class.md)|This class describes an exception thrown by the PPL tasks layer in order to force the current task to cancel. It is also thrown by the `get()` method on [task](task-class.md), for a canceled task.|
114108
|[task_completion_event Class](task-completion-event-class.md)|The `task_completion_event` class allows you to delay the execution of a task until a condition is satisfied, or start a task in response to an external event.|
115109
|[task_continuation_context Class](task-continuation-context-class.md)|The `task_continuation_context` class allows you to specify where you would like a continuation to be executed. It is only useful to use this class from a UWP app. For non-Windows Runtime apps, the task continuation's execution context is determined by the runtime, and not configurable.|
116110
|[task_group Class](task-group-class.md)|The `task_group` class represents a collection of parallel work which can be waited on or canceled.|
@@ -169,7 +163,7 @@ namespace concurrency;
169163
|[asend Function](concurrency-namespace-functions.md#asend)|Overloaded. An asynchronous send operation, which schedules a task to propagate the data to the target block.|
170164
|[cancel_current_task Function](concurrency-namespace-functions.md#cancel_current_task)|Cancels the currently executing task. This function can be called from within the body of a task to abort the task's execution and cause it to enter the `canceled` state.<br /><br /> It is not a supported scenario to call this function if you are not within the body of a `task`. Doing so will result in undefined behavior such as a crash or a hang in your application.|
171165
|[create_async Function](concurrency-namespace-functions.md#create_async)|Creates a Windows Runtime asynchronous construct based on a user supplied lambda or function object. The return type of `create_async` is one of either `IAsyncAction^`, `IAsyncActionWithProgress<TProgress>^`, `IAsyncOperation<TResult>^`, or `IAsyncOperationWithProgress<TResult, TProgress>^` based on the signature of the lambda passed to the method.|
172-
|[create_task Function](concurrency-namespace-functions.md#create_task)|Overloaded. Creates a PPL [task](https://msdn.microsoft.com/5389e8a5-5038-40b6-844a-55e9b58ad35f) object. `create_task` can be used anywhere you would have used a task constructor. It is provided mainly for convenience, because it allows use of the `auto` keyword while creating tasks.|
166+
|[create_task Function](concurrency-namespace-functions.md#create_task)|Overloaded. Creates a PPL [task](task-class.md) object. `create_task` can be used anywhere you would have used a task constructor. It is provided mainly for convenience, because it allows use of the `auto` keyword while creating tasks.|
173167
|[CreateResourceManager Function](concurrency-namespace-functions.md#createresourcemanager)|Returns an interface that represents the singleton instance of the Concurrency Runtime's Resource Manager. The Resource Manager is responsible for assigning resources to schedulers that want to cooperate with each other.|
174168
|[DisableTracing Function](concurrency-namespace-functions.md#disabletracing)|Disables tracing in the Concurrency Runtime. This function is deprecated because ETW tracing is unregistered by default.|
175169
|[EnableTracing Function](concurrency-namespace-functions.md#enabletracing)|Enables tracing in the Concurrency Runtime. This function is deprecated because ETW tracing is now on by default.|

docs/parallel/concrt/reference/concurrent-unordered-map-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ std::pair<const_iterator,
309309
The key value to search for.
310310

311311
### Return Value
312-
A [pair](https://msdn.microsoft.com/c5a37023-d939-4eb2-ae24-ce8e0cd4505d) where the first element is an iterator to the beginning and the second element is an iterator to the end of the range.
312+
A [pair](../../../standard-library/pair-structure.md) where the first element is an iterator to the beginning and the second element is an iterator to the end of the range.
313313

314314
### Remarks
315315
It is possible for concurrent inserts to cause additional keys to be inserted after the begin iterator and before the end iterator.

docs/parallel/concrt/reference/concurrent-unordered-multimap-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ std::pair<const_iterator,
287287
The key value to search for.
288288

289289
### Return Value
290-
A [pair](https://msdn.microsoft.com/32e72d66-3020-4cb9-92c3-f7a5fa7998ff) where the first element is an iterator to the beginning and the second element is an iterator to the end of the range.
290+
A [pair](../../../standard-library/pair-structure.md) where the first element is an iterator to the beginning and the second element is an iterator to the end of the range.
291291

292292
### Remarks
293293
It is possible for concurrent inserts to cause additional keys to be inserted after the begin iterator and before the end iterator.

docs/parallel/concrt/reference/concurrent-unordered-multiset-class.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ std::pair<const_iterator,
275275
The key value to search for.
276276

277277
### Return Value
278-
A [pair](https://msdn.microsoft.com/32e72d66-3020-4cb9-92c3-f7a5fa7998ff) where the first element is an iterator to the beginning and the second element is an iterator to the end of the range.
278+
A [pair](../../../standard-library/pair-structure.md) where the first element is an iterator to the beginning and the second element is an iterator to the end of the range.
279279

280280
### Remarks
281281
It is possible for concurrent inserts to cause additional keys to be inserted after the begin iterator and before the end iterator.

0 commit comments

Comments
 (0)