Skip to content

Commit 9d0addf

Browse files
committed
tparam order in indeterminate_domain doesn't matter
1 parent 1772640 commit 9d0addf

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

examples/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ function(def_example example)
2929
split(${example} target source)
3030
add_executable(${target} ${source})
3131
target_compile_options(${target} PUBLIC
32-
$<$<CXX_COMPILER_ID:GNU>:-Wno-maybe-uninitialized>) # warnings being emitted from stdlib headers, why?
32+
$<$<CXX_COMPILER_ID:GNU>:-Wno-maybe-uninitialized> # warnings being emitted from stdlib headers, why?
33+
$<$<CXX_COMPILER_ID:Clang>:-Wno-gnu-line-marker>
34+
)
3335
target_link_libraries(${target}
3436
PRIVATE STDEXEC::stdexec
3537
stdexec_executable_flags

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ target_compile_definitions(common_test_settings INTERFACE
100100
target_compile_options(common_test_settings INTERFACE
101101
$<$<CXX_COMPILER_ID:MSVC>:/wd4714> # function marked as __forceinline not inlined
102102
$<$<CXX_COMPILER_ID:GNU>:-Wno-maybe-uninitialized> # warnings being emitted from stdlib headers, why?
103+
$<$<CXX_COMPILER_ID:Clang>:-Wno-gnu-line-marker>
103104
)
104105
target_link_libraries(common_test_settings INTERFACE $<TARGET_NAME_IF_EXISTS:TBB::tbb>)
105106
# target_compile_definitions(

test/stdexec/detail/test_common_domain.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ namespace
4444
STATIC_REQUIRE(std::same_as<common2, ex::default_domain>);
4545

4646
using common3 = common_domain_t<gpu_domain, thread_pool_domain>;
47-
STATIC_REQUIRE(std::same_as<common3, ex::indeterminate_domain<gpu_domain, thread_pool_domain>>);
47+
STATIC_REQUIRE(
48+
std::same_as<common3, ex::indeterminate_domain<gpu_domain, thread_pool_domain>>
49+
|| std::same_as<common3, ex::indeterminate_domain<thread_pool_domain, gpu_domain>>);
4850
}
49-
5051
} // namespace

0 commit comments

Comments
 (0)