Skip to content

Commit 92e182a

Browse files
committed
US 7
Signed-off-by: Matthias Kretz <[email protected]>
1 parent 5ff5aac commit 92e182a

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/algorithms.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
}
114114

115115
// Exposition only: Suppress template argument deduction.
116-
template<class T> struct no_deduce { using type = T; };
117-
template<class T> using no_deduce_t = typename no_deduce<T>::type;
116+
template<class T> struct type_identity { using type = T; };
117+
template<class T> using type_identity_t = typename type_identity<T>::type;
118118

119119
// \ref{parallel.alg.reductions}, Support for reductions
120120
template<class T, class BinaryOperation>
@@ -142,18 +142,18 @@
142142

143143
// \ref{parallel.alg.forloop}, For loop
144144
template<class I, class... Rest>
145-
void for_loop(no_deduce_t<I> start, I finish, Rest&&... rest);
145+
void for_loop(type_identity_t<I> start, I finish, Rest&&... rest);
146146
template<class ExecutionPolicy,
147147
class I, class... Rest>
148148
void for_loop(ExecutionPolicy&& exec,
149-
no_deduce_t<I> start, I finish, Rest&&... rest);
149+
type_identity_t<I> start, I finish, Rest&&... rest);
150150
template<class I, class S, class... Rest>
151-
void for_loop_strided(no_deduce_t<I> start, I finish,
151+
void for_loop_strided(type_identity_t<I> start, I finish,
152152
S stride, Rest&&... rest);
153153
template<class ExecutionPolicy,
154154
class I, class S, class... Rest>
155155
void for_loop_strided(ExecutionPolicy&& exec,
156-
no_deduce_t<I> start, I finish,
156+
type_identity_t<I> start, I finish,
157157
S stride, Rest&&... rest);
158158
template<class I, class Size, class... Rest>
159159
void for_loop_n(I start, Size n, Rest&&... rest);
@@ -305,14 +305,14 @@
305305

306306
\begin{itemdecl}
307307
template<class I, class... Rest>
308-
void for_loop(no_deduce_t<I> start, I finish, Rest&&... rest);
308+
void for_loop(type_identity_t<I> start, I finish, Rest&&... rest);
309309
template<class ExecutionPolicy, class I, class... Rest>
310-
void for_loop(ExecutionPolicy&& exec, no_deduce_t<I> start, I finish, Rest&&... rest);
310+
void for_loop(ExecutionPolicy&& exec, type_identity_t<I> start, I finish, Rest&&... rest);
311311

312312
template<class I, class S, class... Rest>
313-
void for_loop_strided(no_deduce_t<I> start, I finish, S stride, Rest&&... rest);
313+
void for_loop_strided(type_identity_t<I> start, I finish, S stride, Rest&&... rest);
314314
template<class ExecutionPolicy, class I, class S, class... Rest>
315-
void for_loop_strided(ExecutionPolicy&& exec, no_deduce_t<I> start, I finish, S stride,
315+
void for_loop_strided(ExecutionPolicy&& exec, type_identity_t<I> start, I finish, S stride,
316316
Rest&&... rest);
317317

318318
template<class I, class Size, class... Rest>

src/simd.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@
176176

177177
template<class T, class Abi>
178178
where_expression<simd_mask<T, Abi>, simd_mask<T, Abi>>
179-
where(const nodeduce_t<simd_mask<T, Abit>>&, simd_mask<T, Abi>&) noexcept;
179+
where(const type_identity_t<simd_mask<T, Abit>>&, simd_mask<T, Abi>&) noexcept;
180180

181181
template<class T, class Abi>
182182
const_where_expression<simd_mask<T, Abi>, simd_mask<T, Abi>>
183-
where(const nodeduce_t<simd_mask<T, Abit>>&, const simd_mask<T, Abi>&) noexcept;
183+
where(const type_identity_t<simd_mask<T, Abit>>&, const simd_mask<T, Abi>&) noexcept;
184184

185185
template<class T>
186186
where_expression<bool, T>
@@ -2015,10 +2015,10 @@
20152015
const_where_expression<simd_mask<T, Abi>, simd<T, Abi>> where(const typename simd<T, Abi>::mask_type& k,
20162016
const simd<T, Abi>& v) noexcept;
20172017
template<class T, class Abi>
2018-
where_expression<simd_mask<T, Abi>, simd_mask<T, Abi>> where(const nodeduce_t<simd_mask<T, Abi>>& k,
2018+
where_expression<simd_mask<T, Abi>, simd_mask<T, Abi>> where(const type_identity_t<simd_mask<T, Abi>>& k,
20192019
simd_mask<T, Abi>& v) noexcept;
20202020
template<class T, class Abi>
2021-
const_where_expression<simd_mask<T, Abi>, simd_mask<T, Abi>> where(const nodeduce_t<simd_mask<T, Abi>>& k,
2021+
const_where_expression<simd_mask<T, Abi>, simd_mask<T, Abi>> where(const type_identity_t<simd_mask<T, Abi>>& k,
20222022
const simd_mask<T, Abi>& v) noexcept;
20232023
\end{itemdecl}
20242024

0 commit comments

Comments
 (0)