Fix boost bind placeholder warnings.

[libdcp.git] / tools / dcpverify.cc

diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc
index db4b2bce9f72202e2bbefa624d52414d3a833e7e..770dd78fa75c93bf9f37df5e2329f15dbf17ca56 100644 (file)
--- a/tools/dcpverify.cc
+++ b/tools/dcpverify.cc
@@ -37,9 +37,9 @@
 #include "raw_convert.h"
 #include "verify.h"
 #include "version.h"
-#include <boost/bind.hpp>
-#include <boost/optional.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <getopt.h>
 #include <iostream>
 #include <cstdlib>
@@ -52,6 +52,9 @@ using std::string;
 using std::vector;
 using boost::bind;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 
 static void
@@ -200,10 +203,15 @@ main (int argc, char* argv[])
        }
 
        if (!failed && !quiet) {
-               if (bv21_failed || warned) {
-                       cout << "\n";
+               if (bv21_failed && warned) {
+                       cout << "\nDCP verified OK (but with Bv2.1 errors and warnings).\n";
+               } else if (bv21_failed) {
+                       cout << "\nDCP verified OK (but with Bv2.1 errors).\n";
+               } else if (warned) {
+                       cout << "\nDCP verified OK (but with warnings).\n";
+               } else {
+                       cout << "DCP verified OK.\n";
                }
-               cout << "DCP verified OK.\n";
        }
 
        exit (failed ? EXIT_FAILURE : EXIT_SUCCESS);