From ee699d3fa60a51d88f1e2908eda51578cbf2e87c Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 7 Feb 2017 20:40:06 +0000 Subject: [PATCH] Revert 'use tbb::atomic for cp' --- assignment-client/src/audio/AudioMixerClientData.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerClientData.h b/assignment-client/src/audio/AudioMixerClientData.h index 1314023d36..c30923f411 100644 --- a/assignment-client/src/audio/AudioMixerClientData.h +++ b/assignment-client/src/audio/AudioMixerClientData.h @@ -130,13 +130,16 @@ private: class IgnoreNodeCache { public: + // std::atomic is not copyable - always initialize uncached + IgnoreNodeCache() {} + IgnoreNodeCache(const IgnoreNodeCache& other) {} + void cache(bool shouldIgnore); bool isCached(); bool shouldIgnore(); private: - // tbb::atomic supports copy-ctor - tbb::atomic _isCached { false }; + std::atomic _isCached { false }; bool _shouldIgnore { false }; }; struct IgnoreNodeCacheHasher { std::size_t operator()(const QUuid& key) const { return qHash(key); } };