projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes for Boost >= 1.73
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_server.cc
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index 1554c02f4541ff11374b06ceddc41afffc5c43f3..696fec09ae1b37c73071b9707e204ac0f3a55f79 100644
(file)
--- a/
src/tools/dcpomatic_server.cc
+++ b/
src/tools/dcpomatic_server.cc
@@
-29,9
+29,12
@@
#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/taskbar.h>
#include <wx/splash.h>
#include <wx/icon.h>
#include <wx/taskbar.h>
#include <wx/splash.h>
#include <wx/icon.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <boost/thread.hpp>
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
@@
-48,6
+51,9
@@
using boost::thread;
using boost::bind;
using boost::optional;
using boost::dynamic_pointer_cast;
using boost::bind;
using boost::optional;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
enum {
ID_status = 1,
enum {
ID_status = 1,
@@
-72,11
+78,6
@@
public:
return a;
}
return a;
}
- string head_and_tail (int) const {
- /* Not necessary */
- return "";
- }
-
float fps () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _fps;
float fps () const {
boost::mutex::scoped_lock lm (_state_mutex);
return _fps;
@@
-258,7
+259,6
@@
class App : public wxApp, public ExceptionStore
public:
App ()
: wxApp ()
public:
App ()
: wxApp ()
- , _thread (0)
, _icon (0)
{}
, _icon (0)
{}
@@
-302,7
+302,7
@@
private:
#else
_icon = new TaskBarIcon;
#endif
#else
_icon = new TaskBarIcon;
#endif
- _thread =
new
thread (bind (&App::main_thread, this));
+ _thread = thread (bind (&App::main_thread, this));
Bind (wxEVT_TIMER, boost::bind (&App::check, this));
_timer.reset (new wxTimer (this));
Bind (wxEVT_TIMER, boost::bind (&App::check, this));
_timer.reset (new wxTimer (this));
@@
-359,7
+359,7
@@
private:
message_dialog (0, std_to_wx (m));
}
message_dialog (0, std_to_wx (m));
}
- boost::thread
*
_thread;
+ boost::thread _thread;
TaskBarIcon* _icon;
shared_ptr<wxTimer> _timer;
};
TaskBarIcon* _icon;
shared_ptr<wxTimer> _timer;
};