From 6b27bdb52370ead26c78fcace1390469daea04ea Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Thu, 11 Jun 2015 19:38:37 +0200 Subject: [PATCH] fix clang & gcc build --- fluent/Continuable.h | 7 +++++-- test.cpp | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fluent/Continuable.h b/fluent/Continuable.h index 81f81d0..a8990fb 100644 --- a/fluent/Continuable.h +++ b/fluent/Continuable.h @@ -38,8 +38,7 @@ namespace detail template class Continuable; -template -class Continuable, _State> +namespace detail { /// Corrects void return types from functional types which should be Continuable> template @@ -56,7 +55,11 @@ class Continuable, _State> { typedef Continuable<_CArgs...> type; }; +} +template +class Continuable, _State> +{ public: typedef std::function&&)> ForwardFunction; diff --git a/test.cpp b/test.cpp index 93c9391..68dfd44 100644 --- a/test.cpp +++ b/test.cpp @@ -107,6 +107,12 @@ int main(int /*argc*/, char** /*argv*/) typedef fu::requires_functional_constructible>::type test_assert1; // typedef fu::requires_functional_constructible>::type test_assert2; + typedef detail::convert_void_to_continuable test5; + test5* _test5 = nullptr; + + typedef detail::convert_void_to_continuable>> test6; + test6* _test6 = nullptr; + // auto cba2 = make_continuable(myvec); std::cout << "ok" << std::endl;