std::shared_ptr

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 1c1091f28fb0e8d983ef7984b874cdeb9c899237..56de057a68bc76997e5bb4a6a1289ecc480ed023 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -29,12 +29,15 @@
 #include "test.h"
 #include <dcp/certificate_chain.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::string;
 using std::vector;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (digest_head_tail_test)
@@ -98,32 +101,11 @@ BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
 
 BOOST_AUTO_TEST_CASE (utf8_strlen_test)
 {
-       BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11);
-       BOOST_CHECK_EQUAL (utf8_strlen("hëllo world"), 11);
-       BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11);
+       BOOST_CHECK_EQUAL (utf8_strlen("hello world"), 11U);
+       BOOST_CHECK_EQUAL (utf8_strlen("hëllo world"), 11U);
+       BOOST_CHECK_EQUAL (utf8_strlen("hëłlo wørld"), 11U);
 }
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-BOOST_AUTO_TEST_CASE (swaroop_chain_test)
-{
-       shared_ptr<dcp::CertificateChain> cc (
-               new dcp::CertificateChain (
-                       openssl_path(),
-                       "dcpomatic.com",
-                       "dcpomatic.com",
-                       ".dcpomatic.smpte-430-2.ROOT",
-                       ".dcpomatic.smpte-430-2.INTERMEDIATE",
-                       "CS.dcpomatic.smpte-430-2.LEAF"
-                       )
-               );
-
-       write_swaroop_chain (cc, "build/test/swaroop_chain");
-       shared_ptr<dcp::CertificateChain> back = read_swaroop_chain ("build/test/swaroop_chain");
-
-       BOOST_CHECK (cc->root_to_leaf() == back->root_to_leaf());
-}
-#endif
-
 BOOST_AUTO_TEST_CASE (careful_string_filter_test)
 {
        BOOST_CHECK_EQUAL ("hello_world", careful_string_filter("hello_world"));