Fix boost bind placeholder warnings.

[libdcp.git] / test / asset_test.cc

diff --git a/test/asset_test.cc b/test/asset_test.cc
index e493fa8e7105e51611842b544c47d4418931a1c5..b4a48296c8cc388be264ef68c5afce85c9662060 100644 (file)
--- a/test/asset_test.cc
+++ b/test/asset_test.cc
@@ -31,39 +31,46 @@
     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));
 }