some unix changes

This commit is contained in:
Denis Blank 2015-07-03 02:16:38 +02:00 committed by Naios
parent 5c308a1e08
commit b02045e7e3
2 changed files with 5 additions and 6 deletions

View File

@ -554,9 +554,8 @@ namespace detail
// TODO Improve the lock here
std::lock_guard<std::mutex> 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)

View File

@ -415,13 +415,13 @@ int main(int /*argc*/, char** /*argv*/)
[] {
return make_continuable([](Callback<bool, bool, double, std::unique_ptr<std::string>>&& callback)
{
callback(true, false, 0.3f, std::make_unique<std::string>("oh, all work is done!"));
callback(true, false, 0.3f/*, std::unique_ptr<std::string>(new std::string("oh, all work is done!"))*/);
});
},
TrivialPromise())
.then([](SpellCastResult r0, SpellCastResult r1, bool r2, bool r3, double r4, std::unique_ptr<std::string> message)
.then([](SpellCastResult r0, SpellCastResult r1, bool r2, bool r3, double r4/*, std::unique_ptr<std::string> message*/)
{
return TrivialPromise("Lets see... ").then(Log(*message));
return TrivialPromise("Lets see... ")/*.then(Log(*message))*/;
})
.then([]
{