Skip to content

Commit 340a494

Browse files
author
Colin Robertson
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into cr-new-error
2 parents 3ddca26 + 9b6bd91 commit 340a494

495 files changed

Lines changed: 1480 additions & 4374 deletions

File tree

Some content is hidden

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

‎docs/mfc/reference/delegate-and-interface-maps.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ helpviewer_keywords:
1414
- "delegate map macros"
1515
- "event map macros"
1616
- "interface map macros"
17-
ms.assetid: 3840e642-ff7d-4bdc-998b-c7d8fc50890e
17+
ms.assetid: 3840e642-ff7d-4bdc-998b-c7d8fc50890e
1818
caps.latest.revision: 1
1919
author: "mikeblome"
2020
ms.author: "mblome"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.technology:
88
- "devlang-cpp"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
11-
f1_keywords: ['tiled_index', 'AMP/tiled_index', 'AMP/Concurrency::tiled_index::tiled_index', 'AMP/Concurrency::tiled_index::get_tile_extent', 'AMP/Concurrency::tiled_index::barrier ' 'AMP/Concurrency::tiled_index::global ' 'AMP/Concurrency::tiled_index::local', 'AMP/Concurrency::tiled_index::rank', 'AMP/Concurrency::tiled_index::tile', 'AMP/Concurrency::tiled_index::tile_dim0', 'AMP/Concurrency::tiled_index::tile_dim1', 'AMP/Concurrency::tiled_index::tile_dim2', 'AMP/Concurrency::tiled_index::tile_origin', 'AMP/Concurrency::tiled_index::tile_extent']
11+
f1_keywords: ['tiled_index', 'AMP/tiled_index', 'AMP/Concurrency::tiled_index::tiled_index', 'AMP/Concurrency::tiled_index::get_tile_extent', 'AMP/Concurrency::tiled_index::barrier', 'AMP/Concurrency::tiled_index::global', 'AMP/Concurrency::tiled_index::local', 'AMP/Concurrency::tiled_index::rank', 'AMP/Concurrency::tiled_index::tile', 'AMP/Concurrency::tiled_index::tile_dim0', 'AMP/Concurrency::tiled_index::tile_dim1', 'AMP/Concurrency::tiled_index::tile_dim2', 'AMP/Concurrency::tiled_index::tile_origin', 'AMP/Concurrency::tiled_index::tile_extent']
1212
dev_langs:
1313
- "C++"
1414
helpviewer_keywords:

‎docs/parallel/concrt/how-to-provide-work-functions-to-the-call-and-transformer-classes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ This topic illustrates several ways to provide work functions to the [concurrenc
6060

6161
## Example
6262

63-
The following example resembles the previous one, except that it uses the [std::bind1st](../../standard-library/functional-functions.md#bind1st_function) and [std::mem_fun](../../standard-library/functional-functions.md#mem_fun_function) functions to bind a `call` object to a class method.
63+
The following example resembles the previous one, except that it uses the [std::bind1st](../../standard-library/functional-functions.md#bind1st) and [std::mem_fun](../../standard-library/functional-functions.md#mem_fun) functions to bind a `call` object to a class method.
6464

6565

6666
Use this technique if you have to bind a `call` or `transformer` object to a specific class method instead of the function call operator, `operator()`.

‎docs/porting/visual-cpp-change-history-2003-2015.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ When you upgrade to a new version of the Visual C++ compiler, you might encounte
312312
|has_trivial_move_assign|is_trivially_move_assignable|
313313
|has_trivial_destructor|is_trivially_destructible|
314314
315-
- **launch::any and launch::sync policies** The nonstandard launch::any and launch::sync policies were removed. Instead, for launch::any, use launch:async | launch:deferred. For launch::sync, use launch::deferred. See [launch Enumeration](../standard-library/future-enums.md#launch_enumeration).
315+
- **launch::any and launch::sync policies** The nonstandard launch::any and launch::sync policies were removed. Instead, for launch::any, use launch:async | launch:deferred. For launch::sync, use launch::deferred. See [launch Enumeration](../standard-library/future-enums.md#launch).
316316
317317
#### <a name="BK_MFC"></a> MFC and ATL
318318
@@ -2789,4 +2789,4 @@ When you upgrade to a new version of the Visual C++ compiler, you might encounte
27892789
- The compiler now reports unreachable code (C4702).
27902790
27912791
## See Also
2792-
[What's New for Visual C++ in Visual Studio](../what-s-new-for-visual-cpp-in-visual-studio.md)
2792+
[What's New for Visual C++ in Visual Studio](../what-s-new-for-visual-cpp-in-visual-studio.md)

‎docs/standard-library/1-object.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace placeholders {
4949
```
5050

5151
## Remarks
52-
The objects `_1, _2, ... _M` are placeholders designating the first, second, ..., Mth argument, respectively in a function call to an object returned by [bind Function](../standard-library/functional-functions.md#bind_function). You use `_N` to specify where the Nth argument should be inserted when the bind expression is evaluated.
52+
The objects `_1, _2, ... _M` are placeholders designating the first, second, ..., Mth argument, respectively in a function call to an object returned by [bind](../standard-library/functional-functions.md#bind). You use `_N` to specify where the Nth argument should be inserted when the bind expression is evaluated.
5353

5454
In this implementation the value of `M` is 20.
5555

@@ -111,5 +111,5 @@ int main()
111111
**Namespace:** std
112112

113113
## See Also
114-
[bind Function](../standard-library/functional-functions.md#bind_function)
114+
[bind](../standard-library/functional-functions.md#bind)
115115
[is_placeholder Class](../standard-library/is-placeholder-class.md)

‎docs/standard-library/add-const-class.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ ms.technology:
88
- "devlang-cpp"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
11-
f1_keywords:
12-
- "add_const"
13-
- "std::add_const"
14-
- "type_traits/std::add_const"
11+
f1_keywords: ['add_const', 'type_traits/std::add_const']
1512
dev_langs:
1613
- "C++"
1714
helpviewer_keywords:

‎docs/standard-library/add-cv-class.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ ms.technology:
88
- "devlang-cpp"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
11-
f1_keywords:
12-
- "add_cv"
13-
- "std::add_cv"
14-
- "type_traits/std::add_cv"
11+
f1_keywords: ['add_cv', 'type_traits/std::add_cv']
1512
dev_langs:
1613
- "C++"
1714
helpviewer_keywords:

‎docs/standard-library/add-lvalue-reference-class.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ ms.technology:
88
- "devlang-cpp"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
11-
f1_keywords:
12-
- "std::add_lvalue_reference"
13-
- "add_lvalue_reference"
14-
- "type_traits/std::add_lvalue_reference"
15-
- "std.add_lvalue_reference"
11+
f1_keywords: ['add_lvalue_reference', 'type_traits/std::add_lvalue_reference']
1612
dev_langs:
1713
- "C++"
1814
helpviewer_keywords:

‎docs/standard-library/add-pointer-class.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ ms.technology:
88
- "devlang-cpp"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
11-
f1_keywords:
12-
- "add_pointer"
13-
- "std::add_pointer"
14-
- "type_traits/std::add_pointer"
11+
f1_keywords: ['add_pointer', 'type_traits/std::add_pointer']
1512
dev_langs:
1613
- "C++"
1714
helpviewer_keywords:

‎docs/standard-library/add-rvalue-reference-class.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ ms.technology:
88
- "devlang-cpp"
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
11-
f1_keywords:
12-
- "type_traits/std::add_rvalue_reference"
13-
- "std::add_rvalue_reference"
14-
- "add_rvalue_reference"
15-
- "std.add_rvalue_reference"
11+
f1_keywords: ['type_traits/std::add_rvalue_reference', 'add_rvalue_reference']
1612
dev_langs:
1713
- "C++"
1814
helpviewer_keywords:

0 commit comments

Comments
 (0)