X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_batch.cc;h=9cb6ddc5546fc3887a598641e9bfc5c0d3ddd996;hb=290d6d7a61aadda3f6d317465507caa7ffac1ba2;hp=e3beb8dc6deb1760199488c65b60b68abe63c6ef;hpb=b3bc97f68bfdfbb060d971502596b455567dea79;p=dcpomatic.git diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index e3beb8dc6..9cb6ddc55 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -49,10 +48,13 @@ using std::string; using std::cout; using std::list; using std::set; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::scoped_array; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static list films_to_load; @@ -176,13 +178,13 @@ public: set > films; - BOOST_FOREACH (shared_ptr i, JobManager::instance()->get()) { + for (auto i: JobManager::instance()->get()) { films.insert (i->film()); } - BOOST_FOREACH (shared_ptr i, films) { + for (auto i: films) { double progress = 0; - BOOST_FOREACH (shared_ptr j, JobManager::instance()->get()) { + for (auto j: JobManager::instance()->get()) { if (i == j->film() && dynamic_pointer_cast(j)) { progress = j->progress().get_value_or(0); } @@ -435,7 +437,7 @@ class App : public wxApp this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); shared_ptr film; - BOOST_FOREACH (boost::filesystem::path i, films_to_load) { + for (auto i: films_to_load) { if (boost::filesystem::is_directory (i)) { try { film.reset (new Film (i));