X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fasset_test.cc;h=b4a48296c8cc388be264ef68c5afce85c9662060;hb=refs%2Fheads%2Fsmaller-ccap;hp=688f19feb6adc67006bcc6a7574f8f784fa9d55d;hpb=a641fdc912a3f0749015decdf9e23ff15186ef78;p=libdcp.git

diff --git a/test/asset_test.cc b/test/asset_test.cc
index 688f19fe..b4a48296 100644
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,41 +15,62 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
-#include <boost/test/unit_test.hpp>
+
 #include "asset.h"
+#include "equality_options.h"
+#include <boost/bind/bind.hpp>
+#include <boost/test/unit_test.hpp>
+
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+
 
 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));
 }