Skip to content

Commit 4ccfc5e

Browse files
committed
Revert "<ranges>: Temporarily disable join_view for non-forward_ranges, pending resolution of LWG-3698 (microsoft#2727)"
This reverts commit 2966813.
1 parent d4f1e09 commit 4ccfc5e

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

stl/inc/ranges

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3566,19 +3566,6 @@ namespace ranges {
35663566
_EXPORT_STD template <input_range _Vw>
35673567
requires view<_Vw> && input_range<range_reference_t<_Vw>>
35683568
class join_view : public _Join_view_base<_Vw> {
3569-
3570-
#ifndef _USE_JOIN_VIEW_INPUT_RANGE
3571-
static_assert(forward_range<_Vw>,
3572-
"Due to a design flaw, join_view can misbehave "
3573-
"with some input-only ranges (see https://wg21.link/lwg3698). "
3574-
"We believe that WG21 will be unable to fix this problem without breaking ABI. "
3575-
"To minimize breakage when a fix is implemented, "
3576-
"we are temporarily disabling potentially problematic cases. "
3577-
"You can define _USE_JOIN_VIEW_INPUT_RANGE to suppress this error, "
3578-
"but be aware that you will almost certainly need to recompile "
3579-
"when we release a fix.");
3580-
#endif // _USE_JOIN_VIEW_INPUT_RANGE
3581-
35823569
private:
35833570
template <bool _Const>
35843571
using _InnerRng = range_reference_t<_Maybe_const<_Const, _Vw>>;

tests/libcxx/usual_matrix.lst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
RUNALL_INCLUDE ..\universal_prefix.lst
55
RUNALL_CROSSLIST
6-
PM_CL="/EHsc /MTd /std:c++latest /permissive- /utf-8 /FImsvc_stdlib_force_include.h /wd4643 /D_STL_CALL_ABORT_INSTEAD_OF_INVALID_PARAMETER /D_USE_JOIN_VIEW_INPUT_RANGE"
6+
PM_CL="/EHsc /MTd /std:c++latest /permissive- /utf-8 /FImsvc_stdlib_force_include.h /wd4643 /D_STL_CALL_ABORT_INSTEAD_OF_INVALID_PARAMETER"
77
RUNALL_CROSSLIST
88
PM_CL="/analyze:autolog- /Zc:preprocessor /wd6262"
99
PM_COMPILER="clang-cl" PM_CL="-fno-ms-compatibility -fno-delayed-template-parsing -Wno-unqualified-std-cast-call"

tests/std/tests/P0896R4_views_join/test.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) Microsoft Corporation.
22
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
33

4-
#define _USE_JOIN_VIEW_INPUT_RANGE
5-
64
#include <algorithm>
75
#include <array>
86
#include <cassert>

0 commit comments

Comments
 (0)