Skip to content

Commit 41b445c

Browse files
author
Colin Robertson
committed
Another batch of TR1 F1 fixes
1 parent d401518 commit 41b445c

38 files changed

+548
-966
lines changed

‎docs/standard-library/TOC.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
#### [<array> functions](array-functions.md)
3030
#### [<array> operators](array-operators.md)
3131
#### [array Class (C++ Standard Library)](array-class-stl.md)
32-
#### [tuple_element Class <array>](tuple-element-class-array.md)
33-
#### [tuple_size Class <array>](tuple-size-class-array.md)
3432
### [<atomic>](atomic.md)
3533
#### [atomic Structure](atomic-structure.md)
3634
#### [atomic_flag Structure](atomic-flag-structure.md)
@@ -161,7 +159,6 @@
161159
#### [pointer_to_binary_function Class](pointer-to-binary-function-class.md)
162160
#### [pointer_to_unary_function Class](pointer-to-unary-function-class.md)
163161
#### [reference_wrapper Class](reference-wrapper-class.md)
164-
#### [result_of Class2](result-of-class2.md)
165162
#### [unary_function Struct](unary-function-struct.md)
166163
#### [unary_negate Class](unary-negate-class.md)
167164
### [<future>](future.md)
@@ -537,8 +534,6 @@
537534
#### [<utility> operators](utility-operators.md)
538535
#### [identity Structure](identity-structure.md)
539536
#### [pair Structure](pair-structure.md)
540-
#### [tuple_element Class <utility>](tuple-element-class-utility.md)
541-
#### [tuple_size Class <utility>](tuple-size-class-utility.md)
542537
### [<valarray>](valarray.md)
543538
#### [<valarray> functions](valarray-functions.md)
544539
#### [<valarray> operators](valarray-operators.md)

‎docs/standard-library/array.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ Defines the container template class `array` and several supporting templates.
4848
|||
4949
|-|-|
5050
|[array](../standard-library/array-class-stl.md)|Stores a fixed-length sequence of elements.|
51-
|[tuple_element](../standard-library/tuple-element-class-array.md)|Wraps the type of an array element.|
52-
|[tuple_size](../standard-library/tuple-size-class-array.md)|Wraps the size of an array element.|
51+
|[tuple_element](../standard-library/tuple-element-class-tuple.md)|Wraps the type of an array element.|
52+
|[tuple_size](../standard-library/tuple-size-class-tuple.md)|Wraps the size of an array element.|
5353

5454
### Operators
5555

‎docs/standard-library/functional-functions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ unspecified bind(Fty fn, T1 t1, T2 t2, ..., TN tN);
9191
### Remarks
9292
The types `Fty, T1, T2, ..., TN` must be copy constructible, and `INVOKE(fn, t1, ..., tN)` must be a valid expression for some values `w1, w2, ..., wN`.
9393

94-
The first template function returns a forwarding call wrapper `g` with a weak result type. The effect of `g(u1, u2, ..., uM)` is `INVOKE(f, v1, v2, ..., vN,` [result_of Class](../standard-library/result-of-class2.md)`<Fty` `cv` `(V1, V2, ..., VN)>::type)`, where `cv` is the cv-qualifiers of `g` and the values and types of the bound arguments `v1, v2, ..., vN` are determined as specified below. You use it to bind arguments to a callable object to make a callable object with a tailored argument list.
94+
The first template function returns a forwarding call wrapper `g` with a weak result type. The effect of `g(u1, u2, ..., uM)` is `INVOKE(f, v1, v2, ..., vN,` [result_of](../standard-library/result-of-class.md)`<Fty` `cv` `(V1, V2, ..., VN)>::type)`, where `cv` is the cv-qualifiers of `g` and the values and types of the bound arguments `v1, v2, ..., vN` are determined as specified below. You use it to bind arguments to a callable object to make a callable object with a tailored argument list.
9595

9696
The second template function returns a forwarding call wrapper `g` with a nested type `result_type` that is a synonym for `Ret`. The effect of `g(u1, u2, ..., uM)` is `INVOKE(f, v1, v2, ..., vN, Ret)`, where `cv` is the cv-qualifiers of `g` and the values and types of the bound arguments `v1, v2, ..., vN` are determined as specified below. You use it to bind arguments to a callable object to make a callable object with a tailored argument list and with a specified return type.
9797

‎docs/standard-library/functional.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ Defines C++ Standard Library functions that help construct *function objects*—
115115
|[pointer_to_binary_function](../standard-library/pointer-to-binary-function-class.md)|Converts a binary function pointer into an adaptable binary function.|
116116
|[pointer_to_unary_function](../standard-library/pointer-to-unary-function-class.md)|Converts a unary function pointer into an adaptable unary function.|
117117
|[reference_wrapper](../standard-library/reference-wrapper-class.md)|A class that wraps a reference.|
118-
|[result_of](../standard-library/result-of-class2.md)|A struct that holds the return type of a wrapped callable object.|
119118
|[unary_negate](../standard-library/unary-negate-class.md)|A template class providing a member function that negates the return value of a specified unary function.|
120119

121120
### Functions

‎docs/standard-library/regex-operators.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ ms.reviewer: ""
66
ms.suite: ""
77
ms.tgt_pltfrm: ""
88
ms.topic: "article"
9+
f1_keywords:
10+
- "regex/std::operator!="
11+
- "regex/std::operator>"
12+
- "regex/std::operator>="
13+
- "regex/std::operator<"
14+
- "regex/std::operator<="
15+
- "regex/std::operator=="
16+
- "regex/std::operator<<"
917
ms.assetid: ec623e65-c186-491f-aa18-6b12b47e1127
1018
caps.latest.revision: 12
1119
manager: "ghogen"
@@ -702,7 +710,7 @@ bool operator>=(const sub_match<BidIt>& left,
702710
#include <regex>
703711
#include <iostream>
704712

705-
typedef std::tr1std::cmatch::string_type Mystr;
713+
typedef std::cmatch::string_type Mystr;
706714
int main()
707715
{
708716
std::regex rx("c(a*)|(b)");
@@ -734,7 +742,6 @@ int main()
734742

735743
return (0);
736744
}
737-
738745
```
739746
740747
```Output

‎docs/standard-library/regex-token-iterator-class.md‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,34 @@ f1_keywords:
1212
- "regex_token_iterator"
1313
- "std::regex_token_iterator"
1414
- "regex/std::regex_token_iterator"
15+
- "std::regex_token_iterator::regex_type"
16+
- "regex/std::regex_token_iterator::regex_type"
17+
- "std::regex_token_iterator::value_type"
18+
- "regex/std::regex_token_iterator::value_type"
19+
- "std::regex_token_iterator::iterator_category"
20+
- "regex/std::regex_token_iterator::iterator_category"
21+
- "std::regex_token_iterator::difference_type"
22+
- "regex/std::regex_token_iterator::difference_type"
23+
- "std::regex_token_iterator::pointer"
24+
- "regex/std::regex_token_iterator::pointer"
25+
- "std::regex_token_iterator::reference"
26+
- "regex/std::regex_token_iterator::reference"
27+
- "std::regex_token_iterator::operator=="
28+
- "regex/std::regex_token_iterator::operator=="
29+
- "std::regex_token_iterator::operator!="
30+
- "regex/std::regex_token_iterator::operator!="
31+
- "std::regex_token_iterator::operator*"
32+
- "regex/std::regex_token_iterator::operator*"
33+
- "std::regex_token_iterator::operator->"
34+
- "regex/std::regex_token_iterator::operator->"
35+
- "std::regex_token_iterator::operator++"
36+
- "regex/std::regex_token_iterator::operator++"
37+
- "std::regex_token_iterator::operator!="
38+
- "regex/std::regex_token_iterator::operator!="
1539
dev_langs:
1640
- "C++"
1741
helpviewer_keywords:
18-
- "regex_token_iterator class [TR1]"
42+
- "regex_token_iterator class"
1943
ms.assetid: a213ba48-8e4e-4b6b-871a-2637acf05f15
2044
caps.latest.revision: 15
2145
author: "corob-msft"
@@ -46,8 +70,7 @@ template<class BidIt,
4670
class RxTraits = regex_traits<Elem> >
4771
class regex_token_iterator {
4872
public:
49-
typedef basic_regex<Elem, RXtraits>
50-
regex_type;
73+
typedef basic_regex<Elem, RXtraits> regex_type;
5174
typedef sub_match<BidIt> value_type;
5275
typedef std::forward_iterator_tag iterator_category;
5376
typedef std::ptrdiff_t difference_type;
@@ -111,8 +134,7 @@ typedef std::ptrdiff_t difference_type;
111134

112135
### Example
113136

114-
```cpp
115-
137+
```cpp
116138
#include <regex>
117139
#include <iostream>
118140

@@ -173,7 +195,6 @@ int main()
173195

174196
return (0);
175197
}
176-
177198
```
178199
179200
```Output
@@ -205,7 +226,6 @@ match == aa
205226
match == y
206227
match == aa
207228
match == z
208-
209229
```
210230

211231
## <a name="regex_token_iterator__iterator_category"></a> regex_token_iterator::iterator_category

‎docs/standard-library/regex-traits-char-class.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "std::tr1::regex_traits<char>"
13-
- "regex_traits<char>"
14-
- "std.tr1.regex_traits<char>"
12+
- "std::regex_traits<char>"
13+
- "regex/std::regex_traits<char>"
1514
dev_langs:
1615
- "C++"
1716
helpviewer_keywords:
18-
- "regex_traits<char> class [TR1]"
17+
- "regex_traits<char> class"
1918
ms.assetid: ce95ebcd-3687-4ad5-bf1d-b89fdc633675
2019
caps.latest.revision: 17
2120
author: "corob-msft"
@@ -47,7 +46,7 @@ class regex_traits<char>
4746
```
4847

4948
## Remarks
50-
The class is an explicit specialization of template class [regex_traits Class](../standard-library/regex-traits-class.md) for elements of type `char` (so that it can take advantage of library functions that manipulate objects of this type).
49+
The class is an explicit specialization of template class [regex_traits](../standard-library/regex-traits-class.md) for elements of type `char` (so that it can take advantage of library functions that manipulate objects of this type).
5150

5251
## Requirements
5352
**Header:** \<regex>

‎docs/standard-library/regex-traits-class.md‎

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,40 @@ ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
1212
- "regex_traits"
13-
- "std::tr1::regex_traits"
14-
- "std.tr1.regex_traits"
13+
- "std::regex_traits"
14+
- "regex/std::regex_traits"
15+
- "std::regex_traits::char_type"
16+
- "regex/std::regex_traits::char_type"
17+
- "std::regex_traits::size_type"
18+
- "regex/std::regex_traits::size_type"
19+
- "std::regex_traits::string_type"
20+
- "regex/std::regex_traits::string_type"
21+
- "std::regex_traits::locale_type"
22+
- "regex/std::regex_traits::locale_type"
23+
- "std::regex_traits::char_class_type"
24+
- "regex/std::regex_traits::char_class_type"
25+
- "std::regex_traits::length"
26+
- "regex/std::regex_traits::length"
27+
- "std::regex_traits::translate"
28+
- "regex/std::regex_traits::translate"
29+
- "std::regex_traits::translate_nocase"
30+
- "regex/std::regex_traits::translate_nocase"
31+
- "std::regex_traits::transform"
32+
- "regex/std::regex_traits::transform"
33+
- "std::regex_traits::transform_primary"
34+
- "regex/std::regex_traits::transform_primary"
35+
- "std::regex_traits::lookup_classname"
36+
- "regex/std::regex_traits::lookup_classname"
37+
- "std::regex_traits::lookup_collatename"
38+
- "regex/std::regex_traits::lookup_collatename"
39+
- "std::regex_traits::isctype"
40+
- "regex/std::regex_traits::isctype"
41+
- "std::regex_traits::value"
42+
- "regex/std::regex_traits::value"
43+
- "std::regex_traits::imbue"
44+
- "regex/std::regex_traits::imbue"
45+
- "std::regex_traits::getloc"
46+
- "regex/std::regex_traits::getloc"
1547
dev_langs:
1648
- "C++"
1749
helpviewer_keywords:
@@ -41,7 +73,15 @@ Describes characteristics of elements for matching.
4173

4274
## Syntax
4375
```
44-
struct regex_traits {
76+
template<class Elem>
77+
class regex_traits {
78+
public:
79+
typedef Elem char_type;
80+
typedef size_t size_type;
81+
typedef basic_string<Elem> string_type;
82+
typedef locale locale_type;
83+
typedef ctype_base::mask char_class_type;
84+
4585
regex_traits();
4686
static size_type length(const char_type *str);
4787
char_type translate(char_type ch) const;
@@ -55,20 +95,14 @@ struct regex_traits {
5595
template <class FwdIt>
5696
string_type lookup_collatename(FwdIt first, FwdIt last) const;
5797
bool isctype(char_type ch, char_class_type cls) const;
58-
int value(Elem ch, int base) const;
98+
int value(char_type ch, int base) const;
5999
locale_type imbue(locale_type loc);
60100
locale_type getloc() const;
61-
typedef Elem char_type;
62-
typedef T6 size_type;
63-
typedef basic_string<Elem>
64-
string_type;
65-
typedef T7 locale_type;
66-
typedef T8 char_class_type;
67-
};
101+
};
68102
```
69103
#### Parameters
70104
`Elem`
71-
The element type to describe.
105+
The character element type to describe.
72106

73107
## Remarks
74108
The template class describes various regular expression traits for type `Elem`. The template class [basic_regex Class](../standard-library/basic-regex-class.md) uses this information to manipulate elements of type `Elem`.

‎docs/standard-library/regex-traits-wchar-t-class.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ ms.technology:
99
ms.tgt_pltfrm: ""
1010
ms.topic: "article"
1111
f1_keywords:
12-
- "std::tr1::regex_traits<wchar_t>"
13-
- "regex_traits<wchar_t>"
14-
- "std.tr1.regex_traits<wchar_t>"
12+
- "std::regex_traits<wchar_t>"
13+
- "regex/std::regex_traits<wchar_t>"
1514
dev_langs:
1615
- "C++"
1716
helpviewer_keywords:
18-
- "regex_traits<wchar_t> class [TR1]"
17+
- "regex_traits<wchar_t> class"
1918
ms.assetid: 288d6fdb-fb8e-4a4d-904a-53916be7f95b
2019
caps.latest.revision: 17
2120
author: "corob-msft"
@@ -47,7 +46,7 @@ class regex_traits<wchar_t>
4746
```
4847

4948
## Remarks
50-
The class is an explicit specialization of template class [regex_traits Class](../standard-library/regex-traits-class.md) for elements of type `wchar_t` (so that it can take advantage of library functions that manipulate objects of this type).
49+
The class is an explicit specialization of template class [regex_traits](../standard-library/regex-traits-class.md) for elements of type `wchar_t` (so that it can take advantage of library functions that manipulate objects of this type).
5150

5251
## Requirements
5352
**Header:** \<regex>

‎docs/standard-library/regex-typedefs.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ f1_keywords:
6363
- "regex/std::wssub_match"
6464
ms.assetid: e6a69067-106c-4a24-9e08-7c867a3a2260
6565
caps.latest.revision: 10
66+
author: "corob-msft"
67+
ms.author: "corob"
6668
manager: "ghogen"
6769
---
6870
# &lt;regex&gt; typedefs

0 commit comments

Comments
 (0)