Commit ee28c77a authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'ufownl-topic/fix_typed_response_promise' into develop

parents 1028e5b6 a6fad679
...@@ -60,9 +60,9 @@ struct ctm_cmp<typed_mpi<In, Out, empty_type_list>, ...@@ -60,9 +60,9 @@ struct ctm_cmp<typed_mpi<In, Out, empty_type_list>,
typed_mpi<In, type_list<typed_continue_helper<Out>>, empty_type_list>> typed_mpi<In, type_list<typed_continue_helper<Out>>, empty_type_list>>
: std::true_type { }; : std::true_type { };
template <class In, class Out> template <class In, class... Ts>
struct ctm_cmp<typed_mpi<In, Out, empty_type_list>, struct ctm_cmp<typed_mpi<In, type_list<Ts...>, empty_type_list>,
typed_mpi<In, type_list<typed_response_promise<Out>>, empty_type_list>> typed_mpi<In, type_list<typed_response_promise<Ts...>>, empty_type_list>>
: std::true_type { }; : std::true_type { };
template <class In, class L, class R> template <class In, class L, class R>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
namespace caf { namespace caf {
template <class T> template <class... Ts>
class typed_response_promise { class typed_response_promise {
public: public:
typed_response_promise(response_promise promise) : promise_(promise) { typed_response_promise(response_promise promise) : promise_(promise) {
...@@ -37,8 +37,8 @@ public: ...@@ -37,8 +37,8 @@ public:
return static_cast<bool>(promise_); return static_cast<bool>(promise_);
} }
void deliver(T what) const { void deliver(Ts... what) const {
promise_.deliver(make_message(std::move(what))); promise_.deliver(make_message(std::move(what)...));
} }
......
...@@ -46,6 +46,7 @@ endif () ...@@ -46,6 +46,7 @@ endif ()
# build static library only if --build-static or --build-static-only was set # build static library only if --build-static or --build-static-only was set
if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC) if (CAF_BUILD_STATIC_ONLY OR CAF_BUILD_STATIC)
add_library(libcaf_io_static STATIC ${LIBCAF_IO_HDRS} ${LIBCAF_IO_SRCS}) add_library(libcaf_io_static STATIC ${LIBCAF_IO_HDRS} ${LIBCAF_IO_SRCS})
target_link_libraries(libcaf_io_static ${LD_FLAGS} ${LIBCAF_CORE_LIBRARY})
set_target_properties(libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static) set_target_properties(libcaf_io_static PROPERTIES OUTPUT_NAME caf_io_static)
if(NOT WIN32) if(NOT WIN32)
install(TARGETS libcaf_io_static ARCHIVE DESTINATION lib) install(TARGETS libcaf_io_static ARCHIVE DESTINATION lib)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment