summaryrefslogtreecommitdiff
path: root/Rx
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2015-09-09 08:18:51 -0700
committerKirk Shoop <kirk.shoop@microsoft.com>2015-09-09 08:18:51 -0700
commit8e93cf175c9e72d9f6d3e2e08984a3e9c9bca448 (patch)
treec02292322a144832503e02c1d65552d750698ab6 /Rx
parent652bcd9335064e96d0035ec73afa514ce8215b7f (diff)
parent45aa9a8c5d644dbaf238cb557b6d73c949cf345c (diff)
downloadRxCpp-8e93cf175c9e72d9f6d3e2e08984a3e9c9bca448.tar.gz
Merge pull request #176 from ksinica/nextdetacher-atomic
Changed nextdetacher::do_unsubscribe memeber to an atomic type.
Diffstat (limited to 'Rx')
-rw-r--r--Rx/v2/src/rxcpp/rx-subscriber.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Rx/v2/src/rxcpp/rx-subscriber.hpp b/Rx/v2/src/rxcpp/rx-subscriber.hpp
index 30adcfd..abdb7b6 100644
--- a/Rx/v2/src/rxcpp/rx-subscriber.hpp
+++ b/Rx/v2/src/rxcpp/rx-subscriber.hpp
@@ -61,7 +61,7 @@ class subscriber : public subscriber_base<T>
}
}
const this_type* that;
- bool do_unsubscribe;
+ volatile bool do_unsubscribe;
};
struct errordetacher