Skip to content

Commit 33d44fd

Browse files
author
Michael Blome
committed
merge resolutions
2 parents 80df6b3 + d2de51b commit 33d44fd

File tree

39 files changed

+80
-74
lines changed

39 files changed

+80
-74
lines changed

‎docs/atl-mfc-shared/reference/crect-class.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,14 @@ void SetRectEmpty() throw();
14461446
```
14471447

14481448
### Example
1449-
<!-- [!CODE [NVC_ATLMFC_Utilities#53](../codesnippet/vs_snippets_cpp/nvc_atlmfc_utilities#53)] -->
1449+
```cpp
1450+
CRect rect;
1451+
rect.SetRectEmpty();
1452+
1453+
// rect is now (0, 0, 0, 0)
1454+
ASSERT(rect.IsRectEmpty());
1455+
```
1456+
14501457
14511458
## <a name="crect__size"></a> CRect::Size
14521459
The `cx` and `cy` members of the return value contain the height and width of `CRect`.

‎docs/cpp/cpp-built-in-operators-precedence-and-associativity.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,6 @@ The C++ language includes all C operators and adds several new operators. Operat
125125
|[Comma](../cpp/comma-operator.md)|`,`|
126126

127127
## See Also
128-
[Operator Overloading](../cpp/operator-overloading.md)
128+
[Operator Overloading](operator-overloading.md)
129+
129130

‎docs/data/odbc/record-field-exchange-using-the-rfx-functions.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ This topic explains how to use the RFX function calls that make up the body of y
7979

8080

8181
For more information, see the RFX function documentation under [Macros and Globals](../../mfc/reference/mfc-macros-and-globals.md) in the *Class Library Reference*. For information about how C++ data types map to SQL data types, see the table ANSI SQL Data Types Mapped to C++ Data Types in [SQL: SQL and C++ Data Types (ODBC)](../../data/odbc/sql-sql-and-cpp-data-types-odbc.md).
82-
=======
8382

8483
## See Also
8584
[Record Field Exchange (RFX)](../../data/odbc/record-field-exchange-rfx.md)

‎docs/data/record-view-code-created-by-application-wizard-mfc-data-access.md‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ translation.priority.ht:
3535
- "zh-tw"
3636
---
3737
# Record View Code Created by Application Wizard (MFC Data Access)
38-
<<<<<<< HEAD
3938
The [MFC Application Wizard](../mfc/reference/database-support-mfc-application-wizard.md) overrides the view's `OnInitialUpdate` and `OnGetRecordset` member functions. After the framework creates the frame window, document, and view, it calls `OnInitialUpdate` to initialize the view. `OnInitialUpdate` obtains a pointer to the recordset from the document. A call to the base class [CView::OnInitialUpdate](../mfc/reference/cview-class.md#cview__oninitialupdate) function opens the recordset. The following code shows this process for a `CRecordView` — the code for a `CDaoRecordView` is similar:
40-
=======
41-
The [MFC Application Wizard](../mfc/reference/database-support-mfc-application-wizard.md) overrides the view's `OnInitialUpdate` and `OnGetRecordset` member functions. After the framework creates the frame window, document, and view, it calls `OnInitialUpdate` to initialize the view. `OnInitialUpdate` obtains a pointer to the recordset from the document. A call to the base class [CView::OnInitialUpdate](../mfc/reference/cview-class.md#cview__oninitialupdate) function opens the recordset. The following code shows this process for a `CRecordView` — the code for a `CDaoRecordView` is similar:
42-
>>>>>>> master
4339

4440
```
4541
void CSectionForm::OnInitialUpdate()
@@ -49,17 +45,10 @@ void CSectionForm::OnInitialUpdate()
4945
}
5046
```
5147

52-
<<<<<<< HEAD
53-
When the recordset opens, it selects records. [CRecordset::Open](../mfc/reference/crecordset-class.md#crecordset__open) or [CDaoRecordset::Open](../mfc/reference/cdaorecordset-class.md#cdaorecordset__open) makes the first record the current record, and DDX moves data from the recordset's field data members to the corresponding form controls in the view. For more information about RFX, see [Record Field Exchange (RFX)](../data/odbc/record-field-exchange-rfx.md). For more information about DDX, see [Dialog Data Exchange and Validation](../mfc/dialog-data-exchange-and-validation.md). For information about the document/view creation process, see [Using the Classes to Write Applications for Windows](../mfc/using-the-classes-to-write-applications-for-windows.md).
54-
55-
> [!NOTE]
56-
> You should give your end users the capability to refresh the record view controls from the recordset. Without this capability, if a user changes a control's value to an illegal value, the user can be permanently stuck on the current record. To refresh the controls, you call the `CWnd` member function [UpdateData](../mfc/reference/cwnd-class.md#cwnd__updatedata) with a parameter of **FALSE**.
57-
=======
5848
When the recordset opens, it selects records. [CRecordset::Open](../mfc/reference/crecordset-class.md#crecordset__open) or [CDaoRecordset::Open](../mfc/reference/cdaorecordset-class.md#cdaorecordset__open) makes the first record the current record, and DDX moves data from the recordset's field data members to the corresponding form controls in the view. For more information about RFX, see [Record Field Exchange (RFX)](../data/odbc/record-field-exchange-rfx.md). For more information about DDX, see [Dialog Data Exchange and Validation](../mfc/dialog-data-exchange-and-validation.md). For information about the document/view creation process, see [Using the Classes to Write Applications for Windows](../mfc/using-the-classes-to-write-applications-for-windows.md).
5949

6050
> [!NOTE]
6151
> You should give your end users the capability to refresh the record view controls from the recordset. Without this capability, if a user changes a control's value to an illegal value, the user can be permanently stuck on the current record. To refresh the controls, you call the `CWnd` member function [UpdateData](../mfc/reference/cwnd-class.md#cwnd__updatedata) with a parameter of **FALSE**.
62-
>>>>>>> master
6352
6453
## See Also
6554
[Using a Record View](../data/using-a-record-view-mfc-data-access.md)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ for (int i = 0; i <5; i++)
264264
|Copy|Explicit and deep copy at definition.|Implicit copy when it is accessed by the kernel function.|
265265
|Data retrieval|By copying the array data back to an object on the CPU thread.|By direct access of the `array_view` object or by calling the [array_view::synchronize Method](reference/array-view-class.md#array_view__synchronize_method) to continue accessing the data on the original container.|
266266

267+
267268

268269
### Shared memory with array and array_view
269270
Shared memory is memory that can be accessed by both the CPU and the accelerator. The use of shared memory eliminates or significantly reduces the overhead of copying data between the CPU and the accelerator. Although the memory is shared, it cannot be accessed concurrently by both the CPU and the accelerator, and doing so causes undefined behavior.
@@ -395,6 +396,7 @@ void AddArraysWithFunction() {
395396
You can gain additional acceleration by using tiling. Tiling divides the threads into equal rectangular subsets or *tiles*. You determine the appropriate tile size based on your data set and the algorithm that you are coding. For each thread, you have access to the *global* location of a data element relative to the whole `array` or `array_view` and access to the *local* location relative to the tile. Using the local index value simplifies your code because you don't have to write the code to translate index values from global to local. To use tiling, call the [extent::tile Method](reference/extent-class.md#extent__tile_method) on the compute domain in the `parallel_for_each` method, and use a [tiled_index](../../parallel/amp/reference/tiled-index-class.md) object in the lambda expression.
396397
397398
In typical applications, the elements in a tile are related in some way, and the code has to access and keep track of values across the tile. Use the [tile_static Keyword](../../cpp/tile-static-keyword.md) keyword and the [tile_barrier::wait Method](reference/tile-barrier-class.md#tile_barrier__wait_method) to accomplish this. A variable that has the `tile_static` keyword has a scope across an entire tile, and an instance of the variable is created for each tile. You must handle synchronization of tile-thread access to the variable. The [tile_barrier::wait Method](reference/tile-barrier-class.md#tile_barrier__wait_method) stops execution of the current thread until all the threads in the tile have reached the call to `tile_barrier::wait`. So you can accumulate values across the tile by using `tile_static` variables. Then you can finish any computations that require access to all the values.
399+
398400
399401
The following diagram represents a two-dimensional array of sampling data that is arranged in tiles.
400402

‎docs/parallel/amp/reference/accelerator-view-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class accelerator_view;
9191

9292
Physical devices can be shared among many client threads. Client threads can cooperatively use the same `accelerator_view` object of an accelerator, or each client can communicate with a compute device via an independent `accelerator_view` object for isolation from other client threads.
9393

94-
An `accelerator_view` object can have one of two [queuing_mode Enumeration](concurrency-namespace-enums-amp.md#queuing_mode_enumeration) states. If the queuing mode is `immediate`, commands like `copy` and `parallel_for_each` are sent to the corresponding accelerator device as soon as they return to the caller. If the queuing mode is `deferred`, such commands are queued up on a command queue that corresponds to the `accelerator_view` object. Commands are not actually sent to the device until `flush()` is called.
94+
An `accelerator_view` object can have one of two [queuing_mode Enumeration](concurrency-namespace-enums-amp.md#queuing-mode-enumeration) states. If the queuing mode is `immediate`, commands like `copy` and `parallel_for_each` are sent to the corresponding accelerator device as soon as they return to the caller. If the queuing mode is `deferred`, such commands are queued up on a command queue that corresponds to the `accelerator_view` object. Commands are not actually sent to the device until `flush()` is called.
9595

9696
## Requirements
9797
**Header:** amprt.h
@@ -314,4 +314,4 @@ Destroys the accelerator_view object.
314314

315315

316316
## See Also
317-
[Concurrency Namespace (C++ AMP)](../../../parallel/amp/reference/concurrency-namespace-cpp-amp)
317+
[Concurrency Namespace (C++ AMP)](concurrency-namespace-cpp-amp.md)

‎docs/parallel/amp/reference/accelerator-view-removed-class.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class accelerator_view_removed : public runtime_exception;
5757
|Name|Description|
5858
|----------|-----------------|
5959
|[accelerator_view_removed::get_view_removed_reason Method](reference/accelerator-view-removed-class.md#accelerator_view_removed__get_view_removed_reason_method)|Returns an HRESULT error code indicating the cause of the `accelerator_view` object's removal.|
60+
6061

6162
## Inheritance Hierarchy
6263
`exception`

‎docs/parallel/amp/reference/array-class.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ friend class array;
7373
|[array::get_associated_accelerator_view Method](#array__get_associated_accelerator_view_method)|Gets the second [accelerator_view](../../../parallel/amp/reference/accelerator-view-class.md) object that is passed as a parameter when a staging constructor is called to instantiate the [array](../../../parallel/amp/reference/array-class.md) object.|
7474
|[array::get_cpu_access_type Method](#array__get_cpu_access_type_method)|Returns the [access_type](access_type%20enumeration.md) of the array. This method can be accessed only on the CPU.|
7575
|[array::get_extent Method](#array__get_extent_method)|Returns the [extent](../../../parallel/amp/reference/extent-class.md) object of the array.|
76+
7677
|[array::reinterpret_as Method](#array__reinterpret_as_method)|Returns a one-dimensional array that contains all the elements in the `array` object.|
7778
|[array::section Method](#array__section_method)|Returns a subsection of the [array](../../../parallel/amp/reference/array-class.md) object that is at the specified origin and, optionally, that has the specified extent.|
7879
|[array::view_as Method](#array__view_as_method)|Returns an [array_view](../../../parallel/amp/reference/array-view-class.md) object that is constructed from the `array` object.|

‎docs/parallel/amp/reference/completion-future-class.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class completion_future;
6969
|----------|-----------------|
7070
|[completion_future::operator std::shared_future\<void> Operator](#operator_shared_future)|Implicitly converts the `completion_future` object to an `std::shared_future` object.|
7171
|[completion_future::operator= Operator](#operator_eq)|Copies the contents of the specified `completion_future` object into this one.|
72-
>>>>>>> master
7372

7473
## Inheritance Hierarchy
7574
`completion_future`

‎docs/parallel/amp/reference/concurrency-precise-math-namespace.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ translation.priority.mt:
3535
---
3636
# Concurrency::precise_math Namespace
3737
Functions in the `precise_math` namespace are C99 compliant. Both single precision and double precision versions of each function are included. For example, `acos` is the double-precision version and `acosf` is the single-precision version. These functions, including the single-precision functions, require extended double-precision support on the accelerator. You can use the [accelerator::supports_double_precision Data Member](accelerator-class.md#accelerator__supports_double_precision_data_member) to determine if you can run these functions on a specific accelerator.
38+
3839

3940
## Syntax
4041

0 commit comments

Comments
 (0)