X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fdcpdiff.cc;h=1f76082958bf3e68a1f17f4b50ac03a6768a8896;hb=e61267217a8ca7e65ad42bf34b6488b92eca6389;hp=5f9911d449bce0ca4de8d4991a92a473e009e9a4;hpb=d39880eef211a296fa8ef4712cdef5945d08527c;p=libdcp.git

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 5f9911d4..1f760829 100644
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -39,7 +39,6 @@
 #include <boost/optional.hpp>
 #include <memory>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <list>
 
@@ -48,6 +47,7 @@ using std::cerr;
 using std::cout;
 using std::string;
 using std::shared_ptr;
+using std::vector;
 using boost::optional;
 using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
@@ -82,7 +82,7 @@ help (string n)
 void
 note (NoteType t, string n)
 {
-	if (t == DCP_ERROR || verbose) {
+	if (t == NoteType::ERROR || verbose) {
 		cout << " " << n << "\n";
 		cout.flush ();
 	}
@@ -95,17 +95,17 @@ load_dcp (boost::filesystem::path path, bool ignore_missing_assets, optional<str
 	DCP* dcp = 0;
 	try {
 		dcp = new DCP (path);
-		list<dcp::VerificationNote> notes;
+		vector<dcp::VerificationNote> notes;
 		dcp->read (&notes);
 		filter_notes (notes, ignore_missing_assets);
-		BOOST_FOREACH (dcp::VerificationNote i, notes) {
+		for (auto i: notes) {
 			cerr << dcp::note_to_string(i) << "\n";
 		}
 
 		if (key) {
-			list<shared_ptr<Asset> > assets = dcp->assets ();
-			for (list<shared_ptr<Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
-				shared_ptr<MXF> mxf = dynamic_pointer_cast<MXF> (*i);
+			auto assets = dcp->assets ();
+			for (auto i: assets) {
+				auto mxf = dynamic_pointer_cast<MXF>(i);
 				if (mxf) {
 					mxf->set_key (Key (key.get ()));
 				}