projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.cc
diff --git
a/src/wx/timeline_dialog.cc
b/src/wx/timeline_dialog.cc
index 0d0d4f9f98facbe2fcfc33db4c0debb33cbdc419..563c31f703264243946c05e785cec0c7031e26da 100644
(file)
--- a/
src/wx/timeline_dialog.cc
+++ b/
src/wx/timeline_dialog.cc
@@
-32,8
+32,11
@@
using std::list;
using std::cout;
using std::string;
using std::list;
using std::cout;
using std::string;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (
TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (