summaryrefslogtreecommitdiff
path: root/Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2016-10-24 22:48:15 -0700
committerKirk Shoop <kirk.shoop@microsoft.com>2016-10-25 22:28:51 -0700
commit53eac3736ae9587a91e33746ace1eb3641068e8a (patch)
treec7e36a6f84de79687b47b408e9e9884e3fcdbdc3 /Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp
parent067aeb8b652673617dd13b41e2648449b664d40d (diff)
downloadRxCpp-53eac3736ae9587a91e33746ace1eb3641068e8a.tar.gz
decouple reduce
breaking changes to accumulator and result selector function signature. take and return by-value, reduce will move for you. switch from abort to terminate
Diffstat (limited to 'Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp')
-rw-r--r--Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp b/Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp
index bed6ef9..c683996 100644
--- a/Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp
+++ b/Rx/v2/src/rxcpp/schedulers/rx-newthread.hpp
@@ -82,7 +82,7 @@ private:
state->lifetime.add([keepAlive](){
std::unique_lock<std::mutex> guard(keepAlive->lock);
auto expired = std::move(keepAlive->q);
- if (!keepAlive->q.empty()) abort();
+ if (!keepAlive->q.empty()) std::terminate();
keepAlive->wake.notify_one();
});