projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5729cf
)
Hack to remove boost atomic dependency.
author
Carl Hetherington
<cth@carlh.net>
Tue, 1 Sep 2015 10:22:18 +0000
(11:22 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 1 Sep 2015 10:22:18 +0000
(11:22 +0100)
src/lib/encoder.h
patch
|
blob
|
history
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index b255a617ff65d365a11bd031b884b44f385e4686..caadda591d20a606e97c0d9388c0a8abe533539f 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-33,7
+33,6
@@
#include <boost/thread.hpp>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
-#include <boost/atomic.hpp>
#include <list>
#include <stdint.h>
@@
-96,7
+95,8
@@
private:
bool _left_done;
bool _right_done;
- boost::atomic<bool> _terminate;
+ /* XXX: probably should be atomic */
+ bool _terminate;
/** Mutex for _threads */
mutable boost::mutex _threads_mutex;
std::list<boost::thread *> _threads;