projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macOS / new boost build fixes.
[dcpomatic.git]
/
src
/
lib
/
hints.cc
diff --git
a/src/lib/hints.cc
b/src/lib/hints.cc
index 9cc10d7353b7f67842a0b348e0520249d0dd6e1e..34a7a8392f513299adf450b385f7b4b4fafa65fc 100644
(file)
--- a/
src/lib/hints.cc
+++ b/
src/lib/hints.cc
@@
-50,6
+50,9
@@
using boost::weak_ptr;
using boost::optional;
using boost::bind;
using namespace dcpomatic;
using boost::optional;
using boost::bind;
using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
Hints::Hints (weak_ptr<const Film> film)
: _film (film)
Hints::Hints (weak_ptr<const Film> film)
: _film (film)
@@
-69,17
+72,13
@@
Hints::start ()
Hints::~Hints ()
{
Hints::~Hints ()
{
- if (!_thread.joinable()) {
- return;
- }
+ boost::this_thread::disable_interruption dis;
try {
_stop = true;
_thread.interrupt ();
_thread.join ();
try {
_stop = true;
_thread.interrupt ();
_thread.join ();
- } catch (...) {
-
- }
+ } catch (...) {}
}
void
}
void