Skip to content

Commit df83e34

Browse files
authored
Merge pull request #22 from beman-project/fix-various-issues
some fixes to better support clients
2 parents 7dbebda + 5447f46 commit df83e34

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Beman.Execution: Building Block For Asynchronous Programs
1+
# beman.execution26: Building Block For Asynchronous Programs
22

3-
`Beman.Execution` provides the basic vocabulary for asynchronous
3+
`beman.execution26` provides the basic vocabulary for asynchronous
44
programming as well as important algorithms implemented in terms
55
of this vocabulary. The key entities of the vocabulary are:
66

@@ -36,7 +36,7 @@ e.g.:
3636

3737
| Library | Linux | MacOS | Windows |
3838
| ------- | ----- | ----- | ------- |
39-
| build | ![Linux build status](https://github.com/beman-project/Execution26/actions/workflows/linux.yml/badge.svg) | ![MacOS build status](https://github.com/beman-project/Execution26/actions/workflows/macos.yml/badge.svg) | ![Window build status](https://github.com/beman-project/Execution26/actions/workflows/windows.yml/badge.svg) |
39+
| build | ![Linux build status](https://github.com/beman-project/execution26/actions/workflows/linux.yml/badge.svg) | ![MacOS build status](https://github.com/beman-project/execution26/actions/workflows/macos.yml/badge.svg) | ![Window build status](https://github.com/beman-project/execution26/actions/workflows/windows.yml/badge.svg) |
4040

4141
You can just use `make` in the current directory. It will invoke `cmake`,
4242
build the code, and run tests. To have more control over the build-process

include/beman/execution26/detail/meta_combine.hpp

+12-6
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,27 @@
1111

1212
namespace beman::execution26::detail::meta::detail
1313
{
14-
template <typename, typename> struct combine;
14+
template <typename...> struct combine;
1515

16+
template <template <typename...> class L0, typename... T0>
17+
struct combine<L0<T0...>>
18+
{
19+
using type = L0<T0...>;
20+
};
1621
template <template <typename...> class L0, typename... T0,
17-
template <typename...> class L1, typename... T1>
18-
struct combine<L0<T0...>, L1<T1...>>
22+
template <typename...> class L1, typename... T1,
23+
typename... L>
24+
struct combine<L0<T0...>, L1<T1...>, L...>
1925
{
20-
using type = L0<T0..., T1...>;
26+
using type = typename combine<L0<T0..., T1...>, L...>::type;
2127
};
2228
}
2329

2430
namespace beman::execution26::detail::meta
2531
{
26-
template <typename L0, typename L1>
32+
template <typename... L>
2733
using combine
28-
= ::beman::execution26::detail::meta::detail::combine<L0, L1>::type;
34+
= ::beman::execution26::detail::meta::detail::combine<L...>::type;
2935
}
3036

3137
// ----------------------------------------------------------------------------

include/beman/execution26/detail/variant_or_empty.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace beman::execution26::detail
3535

3636
template <typename... T>
3737
using variant_or_empty
38-
= ::beman::execution26::detail::variant_or_empty_helper<T...>::type;
38+
= typename ::beman::execution26::detail::variant_or_empty_helper<T...>::type;
3939
}
4040

4141
// ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)