Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ CMakeUserPresets.json:: cmake/CMakeUserPresets.json
ln -s $< $@

# ==========================================================
appleclang-release llvm-release release: #-dk: I'm not sure why that is needed: CMakeUserPresets.json
appleclang-release llvm-release release:
cmake --preset $@ --log-level=TRACE # XXX --fresh
ln -fs $(BUILDROOT)/$@/compile_commands.json .
cmake --workflow --preset $@

# ==========================================================
appleclang-debug llvm-debug debug: #-dk: I'm not sure why that is needed: CMakeUserPresets.json
appleclang-debug llvm-debug debug:
cmake --preset $@ --log-level=TRACE # XXX --fresh
ln -fs $(BUILDROOT)build/$@/compile_commands.json .
cmake --workflow --preset $@
Expand Down
1 change: 0 additions & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ set(EXAMPLES
if(BEMAN_USE_MODULES)
list(APPEND EXAMPLES modules) # modules.cpp
endif()
# set(EXAMPLES)

foreach(EXAMPLE ${EXAMPLES})
set(EXAMPLE_TARGET ${PROJECT_NAME}.${EXAMPLE})
Expand Down
2 changes: 1 addition & 1 deletion examples/stackoverflow.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// examples/allocator.cpp -*-C++-*-
// examples/stackoverflow.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <coroutine>
Expand Down
4 changes: 2 additions & 2 deletions include/beman/execution/detail/bulk.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#define INCLUDED_BEMAN_EXECUTION_DETAIL_BULK

#include <beman/execution/detail/common.hpp>
#include "beman/execution/detail/sender_adaptor.hpp"
#include "beman/execution/detail/sender_adaptor_closure.hpp"
#include <beman/execution/detail/sender_adaptor.hpp>
#include <beman/execution/detail/sender_adaptor_closure.hpp>
#include <beman/execution/detail/get_completion_signatures.hpp>
#include <beman/execution/detail/meta_combine.hpp>
#include <beman/execution/detail/meta_unique.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/beman/execution/detail/decayed_type_list.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define INCLUDED_BEMAN_EXECUTION_DETAIL_DECAYED_TYPE_LIST

#include <beman/execution/detail/common.hpp>
#include "beman/execution/detail/type_list.hpp"
#include <beman/execution/detail/type_list.hpp>
#include <type_traits>

// ----------------------------------------------------------------------------
Expand Down
9 changes: 5 additions & 4 deletions src/beman/execution/execution.cppm
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,8 @@ namespace beman::execution::detail {

export /* --------- */ template <typename Sender>
using indices_for = typename ::std::remove_reference_t<Sender>::indices_for;
}
} // namespace beman::execution::detail

#line 12 "include/beman/execution/detail/decayed_typeof.hpp"
namespace beman::execution::detail {

Expand Down Expand Up @@ -3873,7 +3874,7 @@ struct sync_wait_receiver {
}
this->state->loop.finish();
}
#line 73 "include/beman/execution/detail/sync_wait.hpp"
#line 74 "include/beman/execution/detail/sync_wait.hpp"
auto get_env() const noexcept -> ::beman::execution::detail::sync_wait_env {
return ::beman::execution::detail::sync_wait_env{&this->state->loop};
}
Expand All @@ -3893,7 +3894,7 @@ struct sync_wait_t {
}
return ::std::move(state.result);
}
#line 93 "include/beman/execution/detail/sync_wait.hpp"
#line 94 "include/beman/execution/detail/sync_wait.hpp"
template <::beman::execution::sender_in<::beman::execution::detail::sync_wait_env> Sender>
requires requires(Sender&& sender, const sync_wait_t& self) {
typename ::beman::execution::detail::sync_wait_result_type<Sender>;
Expand All @@ -3914,7 +3915,7 @@ struct sync_wait_t {
namespace beman::execution {
export /* --------- */ using sync_wait_t = ::beman::execution::detail::sync_wait_t;

#line 159 "include/beman/execution/detail/sync_wait.hpp"
#line 160 "include/beman/execution/detail/sync_wait.hpp"
export /* --------- */ inline constexpr ::beman::execution::sync_wait_t sync_wait{};
} // namespace beman::execution

Expand Down
1 change: 0 additions & 1 deletion tests/beman/execution/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ list(
thread.test
utilities.test
)
# set(execution_tests <test>.test)

include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)

Expand Down
10 changes: 5 additions & 5 deletions tests/beman/execution/exec-bulk.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#ifdef BEMAN_HAS_MODULES
import beman.execution;
#else
#include "beman/execution/detail/bulk.hpp"
#include "beman/execution/detail/just.hpp"
#include "beman/execution/detail/get_completion_signatures.hpp"
#include "beman/execution/detail/get_env.hpp"
#include "beman/execution/detail/sync_wait.hpp"
#include <beman/execution/detail/bulk.hpp>
#include <beman/execution/detail/just.hpp>
#include <beman/execution/detail/get_completion_signatures.hpp>
#include <beman/execution/detail/get_env.hpp>
#include <beman/execution/detail/sync_wait.hpp>
#endif

namespace {
Expand Down
2 changes: 1 addition & 1 deletion tests/beman/execution/include/test/stop_token.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <mutex>
#include <ranges>
#include <thread>
#if false && defined(BEMAN_HAS_MODULES)
#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
import beman.execution;
#else
#include <beman/execution/stop_token.hpp>
Expand Down
2 changes: 1 addition & 1 deletion tests/beman/execution/stopsource-general.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <test/execution.hpp>
#include <test/stop_token.hpp>
#include <cassert>
#if false && defined(BEMAN_HAS_MODULES)
#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
import beman.execution;
#else
#include <beman/execution/stop_token.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <test/execution.hpp>
#include <test/stop_token.hpp>
#if false && defined(BEMAN_HAS_MODULES)
#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
import beman.execution;
#else
#include <beman/execution/stop_token.hpp>
Expand Down
2 changes: 1 addition & 1 deletion tests/beman/execution/stoptoken-general.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <test/execution.hpp>
#include <test/stop_token.hpp>
#if false && defined(BEMAN_HAS_MODULES)
#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
import beman.execution;
#else
#include <beman/execution/stop_token.hpp>
Expand Down
2 changes: 1 addition & 1 deletion tests/beman/execution/stoptoken-mem.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <memory>
#include <test/execution.hpp>
#include <test/stop_token.hpp>
#if false && defined(BEMAN_HAS_MODULES)
#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
import beman.execution;
#else
#include <beman/execution/stop_token.hpp>
Expand Down
2 changes: 1 addition & 1 deletion tests/beman/execution/thread-stoptoken-intro.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <test/execution.hpp>
#include <test/stop_token.hpp>
#include <utility>
#if false && defined(BEMAN_HAS_MODULES)
#if false && defined(BEMAN_HAS_MODULES) //-dk:TODO module disabled
import beman.execution;
#else
#include <beman/execution/stop_token.hpp>
Expand Down