std::shared_ptr

[dcpomatic.git] / src / tools / server_test.cc

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 03a99b2e521be6329e3b73b8018ad60064ed69d4..e3375b98839fc99cdd158ff3d96fa03bfc99518e 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -40,10 +40,13 @@ using std::cout;
 using std::cerr;
 using std::string;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
-using dcp::Data;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
 
 static shared_ptr<Film> film;
 static EncodeServerDescription* server;
@@ -60,8 +63,8 @@ process_video (shared_ptr<PlayerVideo> pvf)
 
        ++frame_count;
 
-       Data local_encoded = local->encode_locally ();
-       Data remote_encoded;
+       ArrayData local_encoded = local->encode_locally ();
+       ArrayData remote_encoded;
 
        string remote_error;
        try {
@@ -80,8 +83,8 @@ process_video (shared_ptr<PlayerVideo> pvf)
                return;
        }
 
-       uint8_t* p = local_encoded.data().get ();
-       uint8_t* q = remote_encoded.data().get ();
+       uint8_t* p = local_encoded.data();
+       uint8_t* q = remote_encoded.data();
        for (int i = 0; i < local_encoded.size(); ++i) {
                if (*p++ != *q++) {
                        cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";