Skip to content

Commit 5d3e331

Browse files
TaojunshenTaojunshen
authored
Merge pull request MicrosoftDocs#787 from MicrosoftDocs/master
5/4 AM Publish
2 parents 76b7653 + 2a93854 commit 5d3e331

File tree

428 files changed

+624
-2758
lines changed

Some content is hidden

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

428 files changed

+624
-2758
lines changed

‎docs/cpp/assignment-operators.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ All assignment operators in the following table except the = and &&= operators a
3636
|--------------|-------------|
3737
|**=**|Store the value of the second operand in the object specified by the first operand (simple assignment).|
3838
|**\*=**|Multiply the value of the first operand by the value of the second operand; store the result in the object specified by the first operand.|
39-
|`/=`|Divide the value of the first operand by the value of the second operand; store the result in the object specified by the first operand.|
40-
|`%=`|Take modulus of the first operand specified by the value of the second operand; store the result in the object specified by the first operand.|
41-
|`+=`|Add the value of the second operand to the value of the first operand; store the result in the object specified by the first operand.|
39+
|**/=**|Divide the value of the first operand by the value of the second operand; store the result in the object specified by the first operand.|
40+
|**%=**|Take modulus of the first operand specified by the value of the second operand; store the result in the object specified by the first operand.|
41+
|**+=**|Add the value of the second operand to the value of the first operand; store the result in the object specified by the first operand.|
4242
|**-=**|Subtract the value of the second operand from the value of the first operand; store the result in the object specified by the first operand.|
4343
|**<\<=**|Shift the value of the first operand left the number of bits specified by the value of the second operand; store the result in the object specified by the first operand.|
4444
|**>>=**|Shift the value of the first operand right the number of bits specified by the value of the second operand; store the result in the object specified by the first operand.|
4545
|**&=**|Obtain the bitwise AND of the first and second operands; store the result in the object specified by the first operand.|
46-
|`^=`|Obtain the bitwise exclusive OR of the first and second operands; store the result in the object specified by the first operand.|
47-
|`&#124;=`|Obtain the bitwise inclusive OR of the first and second operands; store the result in the object specified by the first operand.|
46+
|**^=**|Obtain the bitwise exclusive OR of the first and second operands; store the result in the object specified by the first operand.|
47+
|**\|=**|Obtain the bitwise inclusive OR of the first and second operands; store the result in the object specified by the first operand.|
4848
|**&&=**| Move assignment operator (for class types only). If the second operand is an rvalue, move its resources to the first operand (without copying them). See [Move constructors and move assignment operators](move-constructors-and-move-assignment-operators-cpp.md) for more information.|
4949

5050
**Operator Keywords**
@@ -54,8 +54,8 @@ All assignment operators in the following table except the = and &&= operators a
5454
|Operator|Equivalent|
5555
|--------------|----------------|
5656
|**&=**|`and_eq`|
57-
|`&#124;=`|`or_eq`|
58-
|`^=`|`xor_eq`|
57+
|**\|=**|`or_eq`|
58+
|**^=**|`xor_eq`|
5959

6060
There are two ways to access these operator keywords in your programs: include the header file `iso646.h`, or compile with the [/Za](../build/reference/za-ze-disable-language-extensions.md) (Disable language extensions) compiler option.
6161

‎docs/parallel/amp/cpp-amp-cpp-accelerated-massive-parallelism.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "C++ AMP (C++ Accelerated Massive Parallelism) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-amp"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["C++ AMP (see C++ Accelerated Massive Parallelism)", "C++ Accelerated Massive Parallelism, getting started"]
129
ms.assetid: e27824cb-3167-409b-8c3f-a0e476d8f349
13-
caps.latest.revision: 22
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus"]
1813
---
1914
# C++ AMP (C++ Accelerated Massive Parallelism)

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "C++ AMP Overview | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-amp"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["C++ Accelerated Massive Parallelism, requirements", "C++ Accelerated Massive Parallelism, architecture", "C++ AMP", "C++ Accelerated Massive Parallelism, overview", "C++ Accelerated Massive Parallelism"]
129
ms.assetid: 9e593b06-6e3c-43e9-8bae-6d89efdd39fc
13-
caps.latest.revision: 60
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus"]
1813
---
1914
# C++ AMP Overview

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
title: "Graphics (C++ AMP) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-amp"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
ms.assetid: 190a98a4-5f7d-442e-866b-b374ca74c16f
12-
caps.latest.revision: 27
139
author: "mikeblome"
1410
ms.author: "mblome"
15-
manager: "ghogen"
1611
ms.workload: ["cplusplus"]
1712
---
1813
# Graphics (C++ AMP)

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
title: "accelerator Class | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-amp"]
96
ms.topic: "reference"
107
f1_keywords: ["AMPRT/accelerator", "AMPRT/Concurrency::accelerator::accelerator", "AMPRT/Concurrency::accelerator::create_view", "AMPRT/Concurrency::accelerator::get_all", "AMPRT/Concurrency::accelerator::get_auto_selection_view", "AMPRT/Concurrency::accelerator::get_dedicated_memory", "AMPRT/Concurrency::accelerator::get_default_cpu_access_type", "AMPRT/Concurrency::accelerator::get_default_view", "AMPRT/Concurrency::accelerator::get_description", "AMPRT/Concurrency::accelerator::get_device_path", "AMPRT/Concurrency::accelerator::get_has_display", "AMPRT/Concurrency::accelerator::get_is_debug", "AMPRT/Concurrency::accelerator::get_is_emulated", "AMPRT/Concurrency::accelerator::get_supports_cpu_shared_memory", "AMPRT/Concurrency::accelerator::get_supports_double_precision", "AMPRT/Concurrency::accelerator::get_supports_limited_double_precision", "AMPRT/Concurrency::accelerator::get_version", "AMPRT/Concurrency::accelerator::set_default", "AMPRT/Concurrency::accelerator::set_default_cpu_access_type", "AMPRT/Concurrency::accelerator::cpu_accelerator", "AMPRT/Concurrency::accelerator::dedicated_memory", "AMPRT/Concurrency::accelerator::default_accelerator", "AMPRT/Concurrency::accelerator::default_cpu_access_type", "AMPRT/Concurrency::accelerator::default_view", "AMPRT/Concurrency::accelerator::description", "AMPRT/Concurrency::accelerator::device_path", "AMPRT/Concurrency::accelerator::direct3d_ref", "AMPRT/Concurrency::accelerator::direct3d_warp", "AMPRT/Concurrency::accelerator::has_display", "AMPRT/Concurrency::accelerator::is_debug", "AMPRT/Concurrency::accelerator::is_emulated", "AMPRT/Concurrency::accelerator::supports_cpu_shared_memory", "AMPRT/Concurrency::accelerator::supports_double_precision", "AMPRT/Concurrency::accelerator::supports_limited_double_precision", "AMPRT/Concurrency::accelerator::version"]
118
dev_langs: ["C++"]
129
helpviewer_keywords: ["accelerator class"]
1310
ms.assetid: 37eed593-cf87-4611-9cdc-e98df6c2377a
14-
caps.latest.revision: 29
1511
author: "mikeblome"
1612
ms.author: "mblome"
17-
manager: "ghogen"
1813
ms.workload: ["cplusplus"]
1914
---
2015
# accelerator Class

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
title: "accelerator_view Class | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-amp"]
96
ms.topic: "reference"
107
f1_keywords: ["accelerator_view", "AMPRT/accelerator_view", "AMPRT/Concurrency::accelerator_view:accelerator_view", "AMPRT/Concurrency::accelerator_view:create_marker", "AMPRT/Concurrency::accelerator_view:flush", "AMPRT/Concurrency::accelerator_view:get_accelerator", "AMPRT/Concurrency::accelerator_view:get_is_auto_selection", "AMPRT/Concurrency::accelerator_view:get_is_debug", "AMPRT/Concurrency::accelerator_view:get_queuing_mode", "AMPRT/Concurrency::accelerator_view:get_version", "AMPRT/Concurrency::accelerator_view:wait", "AMPRT/Concurrency::accelerator_view:accelerator", "AMPRT/Concurrency::accelerator_view:is_auto_selection", "AMPRT/Concurrency::accelerator_view:is_debug", "AMPRT/Concurrency::accelerator_view:queuing_mode", "AMPRT/Concurrency::accelerator_view:version"]
118
dev_langs: ["C++"]
129
helpviewer_keywords: ["accelerator_view class"]
1310
ms.assetid: 9f298c21-bf62-46e0-88b8-01c5c78ef144
14-
caps.latest.revision: 18
1511
author: "mikeblome"
1612
ms.author: "mblome"
17-
manager: "ghogen"
1813
ms.workload: ["cplusplus"]
1914
---
2015
# accelerator_view Class

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
title: "accelerator_view_removed Class | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-amp"]
96
ms.topic: "reference"
107
f1_keywords: ["accelerator_view_removed", "AMPRT/accelerator_view_removed", "AMPRT/Concurrency::accelerator_view_removed:accelerator_view_removed", "AMPRT/Concurrency::accelerator_view_removed:get_view_removed_reason"]
118
dev_langs: ["C++"]
129
helpviewer_keywords: ["AMPRT/Concurrency::accelerator_view_removed:accelerator_view_removed Class"]
1310
ms.assetid: 262446de-311c-454e-a5ed-e2aaced0d88a
14-
caps.latest.revision: 6
1511
author: "mikeblome"
1612
ms.author: "mblome"
17-
manager: "ghogen"
1813
ms.workload: ["cplusplus"]
1914
---
2015
# accelerator_view_removed Class

‎docs/parallel/amp/reference/adopt-d3d-access-lock-t-structure.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "adopt_d3d_access_lock_t Structure | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-amp"]
96
ms.topic: "reference"
107
f1_keywords: ["amprt/concurrency::direct3d::adopt_d3d_access_lock_t"]
118
dev_langs: ["C++"]
129
ms.assetid: ef10bb06-88d6-420b-bb81-35895b2e02e6
13-
caps.latest.revision: 5
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus"]
1813
---
1914
# adopt_d3d_access_lock_t Structure

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
title: "array Class | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-amp"]
96
ms.topic: "reference"
107
f1_keywords: ["array", "AMP/array", "AMP/Concurrency::array::array", "AMP/Concurrency::array::copy_to", "AMP/Concurrency::array::data", "AMP/Concurrency::array::get_accelerator_view", "AMP/Concurrency::array::get_associated_accelerator_view", "AMP/Concurrency::array::get_cpu_access_type", "AMP/Concurrency::array::get_extent", "AMP/Concurrency::array::reinterpret_as", "AMP/Concurrency::array::section", "AMP/Concurrency::array::view_as", "AMP/Concurrency::array::rank", "AMP/Concurrency::array::accelerator_view", "AMP/Concurrency::array::associated_accelerator_view", "AMP/Concurrency::array::cpu_access_type", "AMP/Concurrency::array::extent"]
118
dev_langs: ["C++"]
129
helpviewer_keywords: ["array class"]
1310
ms.assetid: 0832b6c1-40f0-421d-9104-6b1baa0c63a7
14-
caps.latest.revision: 31
1511
author: "mikeblome"
1612
ms.author: "mblome"
17-
manager: "ghogen"
1813
ms.workload: ["cplusplus"]
1914
---
2015
# array Class

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
title: "array_view Class | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-amp"]
96
ms.topic: "reference"
107
f1_keywords: ["array_view", "AMP/array_view", "AMP/Concurrency::array_view::array_view", "AMP/Concurrency::array_view::copy_to", "AMP/Concurrency::array_view::data", "AMP/Concurrency::array_view::discard_data", "AMP/Concurrency::array_view::get_extent", "AMP/Concurrency::array_view::get_ref", "AMP/Concurrency::array_view::get_source_accelerator_view", "AMP/Concurrency::array_view::refresh", "AMP/Concurrency::array_view::reinterpret_as", "AMP/Concurrency::array_view::section", "AMP/Concurrency::array_view::synchronize", "AMP/Concurrency::array_view::synchronize_async", "AMP/Concurrency::array_view::synchronize_to", "AMP/Concurrency::array_view::synchronize_to_async", "AMP/Concurrency::array_view::view_as", "AMP/Concurrency::array_view::rank", "AMP/Concurrency::array_view::extent", "AMP/Concurrency::array_view::source_accelerator_view", "AMP/Concurrency::array_view::value_type"]
118
dev_langs: ["C++"]
129
helpviewer_keywords: ["array_view class"]
1310
ms.assetid: 7e7ec9bc-05a2-4372-b05d-752b50006c5a
14-
caps.latest.revision: 21
1511
author: "mikeblome"
1612
ms.author: "mblome"
17-
manager: "ghogen"
1813
ms.workload: ["cplusplus"]
1914
---
2015
# array_view Class

0 commit comments

Comments
 (0)