Skip to content

Commit 07c6d7a

Browse files
committed
Merge branch 'jwp_test_endftk_tools_mod_for_icc' into 'develop'
Jwp test endftk tools mod for icc See merge request njoy/tools!21
2 parents 91c5fe6 + c2ae7b4 commit 07c6d7a

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/tools/std20/views/transform.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,12 @@ struct transform_view : view_interface<transform_view<V, F>>
206206
return x.current_ - y.current_;
207207
}
208208

209+
#ifdef __INTEL_COMPILER
210+
friend decltype(auto) iter_move(const iterator& i)
211+
#else
209212
friend constexpr decltype(auto) iter_move(const iterator& i)
210-
noexcept(iter_move_noexcept_helper)
213+
noexcept(iter_move_noexcept_helper)
214+
#endif
211215
{
212216
if constexpr (std::is_lvalue_reference_v<decltype(*i)>) {
213217
return std::move(*i);

src/tools/std23/views/stride.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,9 @@ struct stride_view : std20::ranges::view_interface< stride_view< R > > {
257257

258258
template < typename B = Base >
259259
friend constexpr auto iter_swap( const iterator& left, const iterator& right )
260+
#ifndef __INTEL_COMPILER
260261
noexcept(noexcept(std20::ranges::iter_swap( left.current_, right.current_ )))
262+
#endif
261263
-> std::enable_if_t<std20::ranges::indirectly_swappable< B > > {
262264

263265
std20::ranges::iter_swap( left.current_, right.current_ );

0 commit comments

Comments
 (0)