Skip to content

Commit b3e6989

Browse files
author
Colin Robertson
committed
First set of TR1 F1 updates
1 parent 441f493 commit b3e6989

31 files changed

+147
-132
lines changed

‎docs/cpp/static-assert.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,17 @@ static_assert(sizeof(void *) == 4, "64-bit code generation is not supported.");
8787
namespace std {
8888
template <class CharT, class Traits = std::char_traits<CharT> >
8989
class basic_string {
90-
static_assert(tr1::is_pod<CharT>::value,
90+
static_assert(std::is_pod<CharT>::value,
9191
"Template argument CharT must be a POD type in class template basic_string");
9292
// ...
9393
};
9494
}
95+
9596
struct NonPOD {
9697
NonPOD(const NonPOD &) {}
9798
virtual ~NonPOD() {}
9899
};
100+
99101
int main()
100102
{
101103
std::basic_string<char> bs;

‎docs/parallel/concrt/reference/call-class.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12+
- "concurrency::call"
1213
- "agents/concurrency::call"
1314
dev_langs:
1415
- "C++"
@@ -40,7 +41,7 @@ A `call` messaging block is a multi-source, ordered `target_block` that invokes
4041
## Syntax
4142

4243
```
43-
template<class T, class _FunctorType = std::tr1::function<void(T const&)>>
44+
template<class T, class _FunctorType = std::function<void(T const&)>>
4445
class call : public target_block<multi_link_registry<ISource<T>>>;
4546
```
4647

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The `concurrent_unordered_map` class is a concurrency-safe container that contro
4242
```
4343
template <typename K,
4444
typename _Element_type,
45-
typename _Hasher = std::tr1::hash<K>,
45+
typename _Hasher = std::hash<K>,
4646
typename key_equality = std::equal_to<K>,
4747
typename _Allocator_type = std::allocator<std::pair<const K,
4848
_Element_type>>
@@ -66,7 +66,7 @@ template <typename K,
6666
The mapped type.
6767

6868
`_Hasher`
69-
The hash function object type. This argument is optional and the default value is `std::tr1::hash<``K``>`.
69+
The hash function object type. This argument is optional and the default value is `std::hash<``K``>`.
7070

7171
`key_equality`
7272
The equality comparison function object type. This argument is optional and the default value is `std::equal_to<``K``>`.
@@ -384,8 +384,8 @@ std::pair<iterator,
384384
V&& value);
385385
386386
template<class V>
387-
typename std::tr1::enable_if<!std::tr1::is_same<const_iterator,
388-
typename std::tr1::remove_reference<V>::type>::value,
387+
typename std::enable_if<!std::is_same<const_iterator,
388+
typename std::remove_reference<V>::type>::value,
389389
iterator>::type insert(
390390
const_iterator _Where,
391391
V&& value);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The `concurrent_unordered_multimap` class is an concurrency-safe container that
4242
```
4343
template <typename K,
4444
typename _Element_type,
45-
typename _Hasher = std::tr1::hash<K>,
45+
typename _Hasher = std::hash<K>,
4646
typename key_equality = std::equal_to<K>,
4747
typename _Allocator_type = std::allocator<std::pair<const K,
4848
_Element_type>>
@@ -66,7 +66,7 @@ template <typename K,
6666
The mapped type.
6767

6868
`_Hasher`
69-
The hash function object type. This argument is optional and the default value is `std::tr1::hash<``K``>`.
69+
The hash function object type. This argument is optional and the default value is `std::hash<``K``>`.
7070

7171
`key_equality`
7272
The equality comparison function object type. This argument is optional and the default value is `std::equal_to<``K``>`.
@@ -361,8 +361,8 @@ iterator insert(
361361
V&& value);
362362
363363
template<class V>
364-
typename std::tr1::enable_if<!std::tr1::is_same<const_iterator,
365-
typename std::tr1::remove_reference<V>::type>::value,
364+
typename std::enable_if<!std::is_same<const_iterator,
365+
typename std::remove_reference<V>::type>::value,
366366
iterator>::type insert(
367367
const_iterator _Where,
368368
V&& value);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The `concurrent_unordered_multiset` class is an concurrency-safe container that
4141

4242
```
4343
template <typename K,
44-
typename _Hasher = std::tr1::hash<K>,
44+
typename _Hasher = std::hash<K>,
4545
typename key_equality = std::equal_to<K>,
4646
typename _Allocator_type = std::allocator<K>
4747
>,
@@ -59,7 +59,7 @@ template <typename K,
5959
The key type.
6060

6161
`_Hasher`
62-
The hash function object type. This argument is optional and the default value is `std::tr1::hash<``K``>`.
62+
The hash function object type. This argument is optional and the default value is `std::hash<``K``>`.
6363

6464
`key_equality`
6565
The equality comparison function object type. This argument is optional and the default value is `std::equal_to<``K``>`.
@@ -349,8 +349,8 @@ iterator insert(
349349
V&& value);
350350
351351
template<class V>
352-
typename std::tr1::enable_if<!std::tr1::is_same<const_iterator,
353-
typename std::tr1::remove_reference<V>::type>::value,
352+
typename std::enable_if<!std::is_same<const_iterator,
353+
typename std::remove_reference<V>::type>::value,
354354
iterator>::type insert(
355355
const_iterator _Where,
356356
V&& value);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The `concurrent_unordered_set` class is an concurrency-safe container that contr
4141

4242
```
4343
template <typename K,
44-
typename _Hasher = std::tr1::hash<K>,
44+
typename _Hasher = std::hash<K>,
4545
typename key_equality = std::equal_to<K>,
4646
typename _Allocator_type = std::allocator<K>
4747
>,
@@ -59,7 +59,7 @@ template <typename K,
5959
The key type.
6060

6161
`_Hasher`
62-
The hash function object type. This argument is optional and the default value is `std::tr1::hash<``K``>`.
62+
The hash function object type. This argument is optional and the default value is `std::hash<``K``>`.
6363

6464
`key_equality`
6565
The equality comparison function object type. This argument is optional and the default value is `std::equal_to<``K``>`.
@@ -351,8 +351,8 @@ std::pair<iterator,
351351
V&& value);
352352
353353
template<class V>
354-
typename std::tr1::enable_if<!std::tr1::is_same<const_iterator,
355-
typename std::tr1::remove_reference<V>::type>::value,
354+
typename std::enable_if<!std::is_same<const_iterator,
355+
typename std::remove_reference<V>::type>::value,
356356
iterator>::type insert(
357357
const_iterator _Where,
358358
V&& value);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "std.tr1._1"
1312
- "_1"
13+
- "std::_1"
14+
- "functional/std::_1"
1415
- "std::tr1::_1"
1516
- "functional/std::tr1::_1"
1617
dev_langs:
1718
- "C++"
1819
helpviewer_keywords:
19-
- "_1 object [TR1]"
20+
- "_1 object"
2021
ms.assetid: 30c3c480-ff31-4708-94be-7d0d65f243c9
2122
caps.latest.revision: 24
2223
author: "corob-msft"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "std::tr1::add_const"
1312
- "add_const"
14-
- "std.tr1.add_const"
15-
- "std.add_const"
1613
- "std::add_const"
1714
- "type_traits/std::add_const"
15+
- "tr1::add_const"
16+
- "std::tr1::add_const"
17+
- "type_traits/std::tr1::add_const"
1818
dev_langs:
1919
- "C++"
2020
helpviewer_keywords:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "std.tr1.add_cv"
1312
- "add_cv"
14-
- "std::tr1::add_cv"
15-
- "std.add_cv"
1613
- "std::add_cv"
1714
- "type_traits/std::add_cv"
15+
- "tr1::add_cv"
16+
- "std::tr1::add_cv"
17+
- "type_traits/std::tr1::add_cv"
1818
dev_langs:
1919
- "C++"
2020
helpviewer_keywords:

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "std::tr1::add_pointer"
13-
- "std.tr1.add_pointer"
1412
- "add_pointer"
15-
- "std.add_pointer"
1613
- "std::add_pointer"
1714
- "type_traits/std::add_pointer"
15+
- "std.add_pointer"
16+
- "std.tr1.add_pointer"
17+
- "tr1::add_pointer"
18+
- "std::tr1::add_pointer"
19+
- "type_traits/std::tr1::add_pointer"
1820
dev_langs:
1921
- "C++"
2022
helpviewer_keywords:

0 commit comments

Comments
 (0)