projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lots of macOS warnings by using a different boost/bind include.
[dcpomatic.git]
/
src
/
wx
/
markers_dialog.cc
diff --git
a/src/wx/markers_dialog.cc
b/src/wx/markers_dialog.cc
index 46e8e6d091e297bec3e572a5cf3b9010ddc35859..c8529f108f64bc00b8d65c17a6a1e4a046332301 100644
(file)
--- a/
src/wx/markers_dialog.cc
+++ b/
src/wx/markers_dialog.cc
@@
-28,7
+28,7
@@
#include "lib/film.h"
#include <dcp/types.h>
#include <wx/gbsizer.h>
#include "lib/film.h"
#include <dcp/types.h>
#include <wx/gbsizer.h>
-#include <boost/bind.hpp>
+#include <boost/bind
/bind
.hpp>
#include <iostream>
using std::cout;
#include <iostream>
using std::cout;
@@
-36,6
+36,7
@@
using boost::bind;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
+using dcpomatic::DCPTime;
class Marker
{
class Marker
{
@@
-100,7
+101,7
@@
private:
weak_ptr<FilmViewer> viewer;
dcp::Marker type;
CheckBox* checkbox;
weak_ptr<FilmViewer> viewer;
dcp::Marker type;
CheckBox* checkbox;
- Timecode<DCPTime>* timecode;
+ Timecode<
dcpomatic::
DCPTime>* timecode;
Button* set_button;
};
Button* set_button;
};