From 06df1c43132f688127fd36456de1aa5908aad9ac Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Wed, 10 Jun 2015 16:24:20 +0200
Subject: [PATCH] some changes

---
 fluent++/Callback.h    |  3 +++
 fluent++/Continuable.h | 19 ++++++++++++++++---
 test.cpp               | 26 ++++++++++++++++++++------
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/fluent++/Callback.h b/fluent++/Callback.h
index 20c7562..b9bba05 100644
--- a/fluent++/Callback.h
+++ b/fluent++/Callback.h
@@ -80,6 +80,7 @@ using shared_callback_of_t = typename detail::unwrap_callback<_CTy>::SharedCallb
 template<typename _CTy>
 using weak_callback_of_t = typename detail::unwrap_callback<_CTy>::WeakCallbackType;
 
+
 template<typename _CTy>
 inline shared_callback_of_t<_CTy>
     make_shared_callback(_CTy&& callback)
@@ -88,6 +89,7 @@ inline shared_callback_of_t<_CTy>
         (std::forward<callback_of_t<_CTy>>(callback));
 }
 
+/* Disabled due to clang errors
 template<typename... Args>
 inline auto make_weak_wrapped_callback(WeakCallback<Args...> const& weak_callback)
     -> Callback<Args...>
@@ -103,5 +105,6 @@ inline auto make_weak_wrapped_callback(SharedCallback<Args...> const& shared_cal
     // Some workarounds for clang...
     return detail::WeakProxyFactory<Args...>::CreateProxyFromShared(shared_callback);
 }
+*/
 
 #endif /// _CALLBACK_H_
diff --git a/fluent++/Continuable.h b/fluent++/Continuable.h
index a66af42..39576c9 100644
--- a/fluent++/Continuable.h
+++ b/fluent++/Continuable.h
@@ -20,25 +20,38 @@
 
 #include "Callback.h"
 
+
+
 template <typename _MTy>
 class ContinuableBase
 {
 
 };
 
-template <typename _ATy, typename _WTy = void>
+template <typename _CTy, typename _WTy = void>
 class Continuable;
 
 template <typename... _ATy>
 class Continuable<Callback<_ATy...>, void>
 {
-
+public:
+    typedef bool type;
 };
 
 template <typename... _ATy, typename _WTy>
 class Continuable<Callback<_ATy...>, _WTy>
 {
-    static_assert(false, "");
+public:
+    typedef int type;
 };
 
+
+/*
+template <typename _CTy>
+auto make_continuable(_CTy&& callback)
+    -> 
+{
+}
+*/
+
 #endif /// _CONTINUABLE_H_
diff --git a/test.cpp b/test.cpp
index 72a4af3..f338a6c 100644
--- a/test.cpp
+++ b/test.cpp
@@ -8,6 +8,16 @@
 #include <iostream>
 #include <exception>
 
+enum SpellCastResult
+{
+    SPELL_FAILED_SUCCESS = 0,
+    SPELL_FAILED_AFFECTING_COMBAT = 1,
+    SPELL_FAILED_ALREADY_AT_FULL_HEALTH = 2,
+    SPELL_FAILED_ALREADY_AT_FULL_MANA = 3,
+    SPELL_FAILED_ALREADY_AT_FULL_POWER = 4,
+    SPELL_FAILED_ALREADY_BEING_TAMED = 5
+};
+
 ProtoContinueable CastSpell(int id)
 {
     std::cout << "Cast " << id << std::endl;
@@ -24,12 +34,12 @@ ProtoContinueable MoveTo(int point)
     return ProtoContinueable();
 }
 
-void CastSpell(int id, Callback<bool> const& callback)
+void CastSpell(int id, Callback<SpellCastResult> const& callback)
 {
     std::cout << "Cast " << id << std::endl;
 
-    // on success call true
-    callback(true);
+    // on success call the callback with SPELL_FAILED_SUCCESS
+    callback(SPELL_FAILED_SUCCESS);
 }
 
 void MoveTo(int point, Callback<bool> const& callback)
@@ -42,9 +52,9 @@ void MoveTo(int point, Callback<bool> const& callback)
 
 int main(int argc, char** argv)
 {
-    make_waterfall<Callback<bool>>()
+    make_waterfall<Callback<SpellCastResult>>()
         // .then(std::bind(&CastSpell, 71382, std::placeholders::_1))
-        .then([](bool success, Callback<bool> const& callback)
+        .then([](SpellCastResult result, Callback<bool> const& callback)
         {
             MoveTo(1, callback);
         })
@@ -141,14 +151,18 @@ int main(int argc, char** argv)
         std::cout << "huhu" << std::endl;
     });
 
+    /*
     auto wrapped = make_weak_wrapped_callback(weak_2);
     auto wrapped2 = make_weak_wrapped_callback(WeakCallback<>(weak_2));
-
     wrapped();
     wrapped2();
+    */
 
 
     typedef Continuable<Callback<bool>> cont;
 
+    typedef Continuable<Callback<bool>>::type myty1;
+    typedef Continuable<Callback<bool>, float>::type myty2;
+
     return 0;
 }