Skip to content

Commit ff77ead

Browse files
authored
Merge pull request #5312 from Rageking8/resolve-rogue-concrt-reference-syntax
Resolve rogue ConcRT reference syntax
2 parents fc11266 + 9b87ca5 commit ff77ead

File tree

5 files changed

+17
-53
lines changed

5 files changed

+17
-53
lines changed

docs/parallel/concrt/reference/concurrent-priority-queue-class.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: concurrent_priority_queue Class"
32
title: "concurrent_priority_queue Class"
4-
ms.date: "11/04/2016"
3+
description: "Learn more about: concurrent_priority_queue Class"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_priority_queue", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::concurrent_priority_queue", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::clear", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::empty", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::get_allocator", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::push", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::size", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::swap", "CONCURRENT_PRIORITY_QUEUE/concurrency::concurrent_priority_queue::try_pop"]
66
helpviewer_keywords: ["concurrent_priority_queue class"]
7-
ms.assetid: 3e740381-0f4e-41fc-8b66-ad0bb55f17a3
87
---
98
# concurrent_priority_queue Class
109

@@ -14,10 +13,9 @@ The `concurrent_priority_queue` class is a container that allows multiple thread
1413

1514
```cpp
1615
template <typename T,
17-
typename _Compare= std::less<T>,
18-
typename _Ax = std::allocator<T>
19-
>,
20-
typename _Ax = std::allocator<T>> class concurrent_priority_queue;
16+
typename _Compare = std::less<T>,
17+
typename _Ax = std::allocator<T>>
18+
class concurrent_priority_queue;
2119
```
2220

2321
### Parameters

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "concurrent_unordered_map Class"
33
description: "Learn more about: concurrent_unordered_map Class"
4-
ms.date: "11/04/2016"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_unordered_map", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::concurrent_unordered_map", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::at", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::hash_function", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::insert", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::key_eq", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::swap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_map::unsafe_erase"]
66
helpviewer_keywords: ["concurrent_unordered_map class"]
77
---
@@ -16,18 +16,8 @@ template <typename K,
1616
typename _Element_type,
1717
typename _Hasher = std::hash<K>,
1818
typename key_equality = std::equal_to<K>,
19-
typename _Allocator_type = std::allocator<std::pair<const K,
20-
_Element_type>>
21-
>,
22-
typename key_equality = std::equal_to<K>,
23-
typename _Allocator_type = std::allocator<std::pair<const K,
24-
_Element_type>>> class concurrent_unordered_map : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K,
25-
_Element_type,
26-
details::_Hash_compare<K,
27-
_Hasher,
28-
key_equality>,
29-
_Allocator_type,
30-
false>>;
19+
typename _Allocator_type = std::allocator<std::pair<const K, _Element_type>>>
20+
class concurrent_unordered_map : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K, _Element_type, details::_Hash_compare<K, _Hasher, key_equality>, _Allocator_type, false>>;
3121
```
3222
3323
### Parameters

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "concurrent_unordered_multimap Class"
33
description: "Learn more about: concurrent_unordered_multimap Class"
4-
ms.date: "11/04/2016"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_unordered_multimap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::concurrent_unordered_multimap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::hash_function", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::insert", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::key_eq", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::swap", "CONCURRENT_UNORDERED_MAP/concurrency::concurrent_unordered_multimap::unsafe_erase"]
66
helpviewer_keywords: ["concurrent_unordered_multimap class"]
77
---
@@ -16,18 +16,8 @@ template <typename K,
1616
typename _Element_type,
1717
typename _Hasher = std::hash<K>,
1818
typename key_equality = std::equal_to<K>,
19-
typename _Allocator_type = std::allocator<std::pair<const K,
20-
_Element_type>>
21-
>,
22-
typename key_equality = std::equal_to<K>,
23-
typename _Allocator_type = std::allocator<std::pair<const K,
24-
_Element_type>>> class concurrent_unordered_multimap : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K,
25-
_Element_type,
26-
details::_Hash_compare<K,
27-
_Hasher,
28-
key_equality>,
29-
_Allocator_type,
30-
true>>;
19+
typename _Allocator_type = std::allocator<std::pair<const K, _Element_type>>>
20+
class concurrent_unordered_multimap : public details::_Concurrent_hash<details::_Concurrent_unordered_map_traits<K, _Element_type, details::_Hash_compare<K, _Hasher, key_equality>, _Allocator_type, true>>;
3121
```
3222
3323
### Parameters

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "concurrent_unordered_multiset Class"
33
description: "Learn more about: concurrent_unordered_multiset Class"
4-
ms.date: "11/04/2016"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_unordered_multiset", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset::concurrent_unordered_multiset", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset::hash_function", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset::insert", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset::key_eq", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset::swap", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_multiset::unsafe_erase"]
66
helpviewer_keywords: ["concurrent_unordered_multiset class"]
77
---
@@ -15,15 +15,8 @@ The `concurrent_unordered_multiset` class is an concurrency-safe container that
1515
template <typename K,
1616
typename _Hasher = std::hash<K>,
1717
typename key_equality = std::equal_to<K>,
18-
typename _Allocator_type = std::allocator<K>
19-
>,
20-
typename key_equality = std::equal_to<K>,
21-
typename _Allocator_type = std::allocator<K>> class concurrent_unordered_multiset : public details::_Concurrent_hash<details::_Concurrent_unordered_set_traits<K,
22-
details::_Hash_compare<K,
23-
_Hasher,
24-
key_equality>,
25-
_Allocator_type,
26-
true>>;
18+
typename _Allocator_type = std::allocator<K>>
19+
class concurrent_unordered_multiset : public details::_Concurrent_hash<details::_Concurrent_unordered_set_traits<K, details::_Hash_compare<K, _Hasher, key_equality>, _Allocator_type, true>>;
2720
```
2821
2922
### Parameters

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "concurrent_unordered_set Class"
33
description: "Learn more about: concurrent_unordered_set Class"
4-
ms.date: "11/04/2016"
4+
ms.date: 11/04/2016
55
f1_keywords: ["concurrent_unordered_set", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set::concurrent_unordered_set", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set::hash_function", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set::insert", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set::key_eq", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set::swap", "CONCURRENT_UNORDERED_SET/concurrency::concurrent_unordered_set::unsafe_erase"]
66
helpviewer_keywords: ["concurrent_unordered_set class"]
77
---
@@ -15,15 +15,8 @@ The `concurrent_unordered_set` class is an concurrency-safe container that contr
1515
template <typename K,
1616
typename _Hasher = std::hash<K>,
1717
typename key_equality = std::equal_to<K>,
18-
typename _Allocator_type = std::allocator<K>
19-
>,
20-
typename key_equality = std::equal_to<K>,
21-
typename _Allocator_type = std::allocator<K>> class concurrent_unordered_set : public details::_Concurrent_hash<details::_Concurrent_unordered_set_traits<K,
22-
details::_Hash_compare<K,
23-
_Hasher,
24-
key_equality>,
25-
_Allocator_type,
26-
false>>;
18+
typename _Allocator_type = std::allocator<K>>
19+
class concurrent_unordered_set : public details::_Concurrent_hash<details::_Concurrent_unordered_set_traits<K, details::_Hash_compare<K, _Hasher, key_equality>, _Allocator_type, false>>;
2720
```
2821
2922
### Parameters

0 commit comments

Comments
 (0)