X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross_osx.cc;h=8b60ff492f2cc8ea4234fa5fd309ce64c852d631;hp=76c451a6f3df2078b77d3ed951421318592f0f18;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index 76c451a6f..8b60ff492 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -31,7 +31,6 @@ extern "C" { #include } #include -#include #include #if BOOST_VERSION >= 106100 #include @@ -331,7 +330,7 @@ analyse_media_path (CFDictionaryRef& description) vector bits; split(bits, path, boost::is_any_of("/")); - BOOST_FOREACH (string i, bits) { + for (auto i: bits) { if (starts_with(i, "PRT")) { mp.prt = i; } @@ -468,11 +467,11 @@ Drive::get () CFRelease(session); /* Mark disks containing mounted partitions as themselves mounted */ - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (!i.whole) { continue; } - BOOST_FOREACH (Disk& j, disks) { + for (auto& j: disks) { if (!j.mount_points.empty() && starts_with(j.mount_point, i.mount_point)) { LOG_DISK("Marking %1 as mounted because %2 is", i.mount_point, j.mount_point); std::copy(j.mount_points.begin(), j.mount_points.end(), back_inserter(i.mount_points)); @@ -482,7 +481,7 @@ Drive::get () /* Make a map of the PRT codes and mount points of mounted, synthesized disks */ map > mounted_synths; - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (!i.real && !i.mount_points.empty()) { LOG_DISK("Found a mounted synth %1 with %2", i.mount_point, i.prt); mounted_synths[i.prt] = i.mount_points; @@ -490,7 +489,7 @@ Drive::get () } /* Mark containers of those mounted synths as themselves mounted */ - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (i.real) { map >::const_iterator j = mounted_synths.find(i.prt); if (j != mounted_synths.end()) { @@ -501,7 +500,7 @@ Drive::get () } vector drives; - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (i.whole) { /* A whole disk that is not a container for a mounted synth */ drives.push_back(Drive(i.mount_point, i.mount_points, i.size, i.vendor, i.model));