X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_common.cc;h=f8556b1fdc1d29d742e3193598fa9562ab1dc7b4;hb=7981eefcfebb563ccf5627f132abdfdef22e0c23;hp=edc806b584fed235a947e53a46751725bac7424c;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc index edc806b58..f8556b1fd 100644 --- a/src/lib/cross_common.cc +++ b/src/lib/cross_common.cc @@ -23,7 +23,6 @@ #include "dcpomatic_log.h" #include "warnings.h" #include -#include DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS @@ -38,7 +37,7 @@ Drive::Drive (string xml) cxml::Document doc; doc.read_string (xml); _device = doc.string_child("Device"); - BOOST_FOREACH (cxml::ConstNodePtr i, doc.node_children("MountPoint")) { + for (auto i: doc.node_children("MountPoint")) { _mount_points.push_back (i->content()); } _size = doc.number_child("Size"); @@ -53,7 +52,7 @@ Drive::as_xml () const xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Drive"); root->add_child("Device")->add_child_text(_device); - BOOST_FOREACH (boost::filesystem::path i, _mount_points) { + for (auto i: _mount_points) { root->add_child("MountPoint")->add_child_text(i.string()); } root->add_child("Size")->add_child_text(dcp::raw_convert(_size)); @@ -96,7 +95,7 @@ string Drive::log_summary () const { string mp; - BOOST_FOREACH (boost::filesystem::path i, _mount_points) { + for (auto i: _mount_points) { mp += i.string() + ","; } if (mp.empty()) {