X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fasset_test.cc;h=d6257ebc9939d0683c9a9f472e929e852e5b0e3f;hb=80a97d01ba21df6d06ca750789bfe0bbacaaee4a;hp=e493fa8e7105e51611842b544c47d4418931a1c5;hpb=ff7e50bfae825ea01d010ba5f8fde44668ddeb9e;p=libdcp.git

diff --git a/test/asset_test.cc b/test/asset_test.cc
index e493fa8e..d6257ebc 100644
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -31,39 +31,41 @@
     files in the program, then also delete it here.
 */
 
-#include <boost/test/unit_test.hpp>
+
 #include "asset.h"
+#include <boost/bind.hpp>
+#include <boost/test/unit_test.hpp>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+
 
 class DummyAsset : public dcp::Asset
 {
 protected:
-	std::string pkl_type (dcp::Standard) const {
+	std::string pkl_type (dcp::Standard) const override {
 		return "none";
 	}
 };
 
-static void
-note_handler (dcp::NoteType, string)
-{
-
-}
 
 /** Test a few dusty corners of Asset */
 BOOST_AUTO_TEST_CASE (asset_test)
 {
-	shared_ptr<DummyAsset> a (new DummyAsset);
+	auto a = make_shared<DummyAsset>();
 	a->_hash = "abc";
-	shared_ptr<DummyAsset> b (new DummyAsset);
+	auto b = make_shared<DummyAsset>();
 	b->_hash = "def";
 
-	BOOST_CHECK (!a->equals (b, dcp::EqualityOptions (), boost::bind (&note_handler, _1, _2)));
+	auto ignore = [](dcp::NoteType, string) {};
+
+	BOOST_CHECK (!a->equals(b, dcp::EqualityOptions(), ignore));
 
 	b->_hash = "abc";
-	BOOST_CHECK (a->equals (b, dcp::EqualityOptions (), boost::bind (&note_handler, _1, _2)));
+	BOOST_CHECK (a->equals(b, dcp::EqualityOptions(), ignore));
 
 	b->_file = "foo/bar/baz";
-	BOOST_CHECK (a->equals (b, dcp::EqualityOptions (), boost::bind (&note_handler, _1, _2)));
+	BOOST_CHECK (a->equals(b, dcp::EqualityOptions(), ignore));
 }