From a95246d45cf9c76b895c4043f4ce2e0ef7698297 Mon Sep 17 00:00:00 2001
From: Denis Blank <denis.blank@outlook.com>
Date: Fri, 9 Mar 2018 11:36:25 +0100
Subject: [PATCH] Attempt to fix the GCC and MSVC build

---
 include/continuable/detail/composition-all.hpp      | 8 +++++---
 test/unit-test/single/test-continuable-traverse.cpp | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/continuable/detail/composition-all.hpp b/include/continuable/detail/composition-all.hpp
index 186a7b3..d7cdb5c 100644
--- a/include/continuable/detail/composition-all.hpp
+++ b/include/continuable/detail/composition-all.hpp
@@ -56,14 +56,16 @@ struct all_hint_deducer {
 
   template <typename First>
   static constexpr auto deduce(hints::signature_hint_tag<First>) {
-    return std::declval<First>();
+    return remapping::unpack_lazy(remapping::lazy_value_t<First>{});
   }
 
   template <typename First, typename Second, typename... Args>
   static constexpr auto
   deduce(hints::signature_hint_tag<First, Second, Args...>) {
-    return spread_this(std::declval<First>(), std::declval<Second>(),
-                       std::declval<Args>()...);
+    return spread_this(
+        remapping::unpack_lazy(remapping::lazy_value_t<First>{}),
+        remapping::unpack_lazy(remapping::lazy_value_t<Second>{}),
+        remapping::unpack_lazy(remapping::lazy_value_t<Args>{})...);
   }
 
   template <
diff --git a/test/unit-test/single/test-continuable-traverse.cpp b/test/unit-test/single/test-continuable-traverse.cpp
index f7bc8d2..d656794 100644
--- a/test/unit-test/single/test-continuable-traverse.cpp
+++ b/test/unit-test/single/test-continuable-traverse.cpp
@@ -549,7 +549,7 @@ TEST(test_strategic_container_traverse, traverse_move_only_wrapped) {
   std::size_t counter = 0;
   traverse_pack(
       [&counter](auto&& ptr) {
-        std::unique_ptr<int> moved(std::forward<decltype(ptr)>(ptr));
+        auto moved(std::forward<decltype(ptr)>(ptr));
         EXPECT_EQ((*moved), 5);
         ++counter;
       },