From b02045e7e3943285112dbdea79185a985a2260a4 Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Fri, 3 Jul 2015 02:16:38 +0200 Subject: [PATCH] some unix changes --- include/Continuable.h | 5 ++--- test.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/Continuable.h b/include/Continuable.h index f3cafbf..d1957a4 100644 --- a/include/Continuable.h +++ b/include/Continuable.h @@ -554,9 +554,8 @@ namespace detail // TODO Improve the lock here std::lock_guard guard(lock); - { - // Never call callbacks twice! - assert(partitions_left); + { // Never call callbacks twice! + // assert(partitions_left); // If all partitions have completed invoke the final callback. if (--partitions_left == 0) diff --git a/test.cpp b/test.cpp index 20f0b8a..988cbfc 100644 --- a/test.cpp +++ b/test.cpp @@ -415,13 +415,13 @@ int main(int /*argc*/, char** /*argv*/) [] { return make_continuable([](Callback>&& callback) { - callback(true, false, 0.3f, std::make_unique("oh, all work is done!")); + callback(true, false, 0.3f/*, std::unique_ptr(new std::string("oh, all work is done!"))*/); }); }, TrivialPromise()) - .then([](SpellCastResult r0, SpellCastResult r1, bool r2, bool r3, double r4, std::unique_ptr message) + .then([](SpellCastResult r0, SpellCastResult r1, bool r2, bool r3, double r4/*, std::unique_ptr message*/) { - return TrivialPromise("Lets see... ").then(Log(*message)); + return TrivialPromise("Lets see... ")/*.then(Log(*message))*/; }) .then([] {