BOOST_FOREACH.

[dcpomatic.git] / src / wx / dolby_doremi_certificate_panel.cc

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index ea0207a9ba067875decfd86654c4707e85b1b947..6eaa1d3aea41e833f652d5c96de671f84d34cd28 100644 (file)
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -28,7 +28,6 @@
 #include <dcp/raw_convert.h>
 #include <curl/curl.h>
 #include <zip.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::string;
@@ -36,6 +35,9 @@ using std::cout;
 using std::list;
 using boost::function;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
 DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog)
@@ -145,7 +147,7 @@ DolbyDoremiCertificatePanel::do_download ()
 
        /* Try dcp2000, imb and ims prefixes (see mantis #375) */
 
-       string const prefix = "ftp://anonymous@ftp.cinema.dolby.com/Certificates/";
+       string const prefix = "ftp://ftp.cinema.dolby.com/Certificates/";
        list<string> urls;
        list<string> files;
 
@@ -177,7 +179,7 @@ DolbyDoremiCertificatePanel::do_download ()
        list<string>::const_iterator i = urls.begin ();
        list<string>::const_iterator j = files.begin ();
        while (!ok && i != urls.end ()) {
-               optional<string> error = get_from_zip_url (*i++, *j++, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+               optional<string> error = get_from_zip_url (*i++, *j++, true, true, boost::bind (&DownloadCertificatePanel::load_certificate, this, _1));
                if (error) {
                        errors.push_back (error.get ());
                } else {
@@ -192,7 +194,7 @@ DolbyDoremiCertificatePanel::do_download ()
                _dialog->message()->SetLabel (wxT (""));
 
                string s;
-               BOOST_FOREACH (string e, errors) {
+               for (auto e: errors) {
                        s += e + "\n";
                }