Rename debug type THREED to THREED_D.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 22eeedbabe3f74f791d4a9126252d23d873ac7d3..eb066ce0fd19edc588704f309cf2eea01ff40e46 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/client_server_test.cc
  *  @brief Test the server class.
- *  @ingroup specific
+ *  @ingroup feature
  *
  *  Create a test image and then encode it using the standard mechanism
  *  and also using a EncodeServer object running on localhost.  Compare the resulting
@@ -42,10 +42,10 @@
 #include <boost/thread.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::optional;
-using boost::weak_ptr;
+using std::weak_ptr;
 using dcp::ArrayData;
 
 void
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        EYES_BOTH,
                        PART_WHOLE,
                        ColourConversion(),
-                       VIDEO_RANGE_FULL,
+                       VideoRange::FULL,
                        weak_ptr<Content>(),
                        optional<Frame>(),
                        false
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        EYES_BOTH,
                        PART_WHOLE,
                        ColourConversion(),
-                       VIDEO_RANGE_FULL,
+                       VideoRange::FULL,
                        weak_ptr<Content>(),
                        optional<Frame>(),
                        false
@@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                        EYES_BOTH,
                        PART_WHOLE,
                        ColourConversion(),
-                       VIDEO_RANGE_FULL,
+                       VideoRange::FULL,
                        weak_ptr<Content>(),
                        optional<Frame>(),
                        false
@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
                        EYES_BOTH,
                        PART_WHOLE,
                        PresetColourConversion::all().front().conversion,
-                       VIDEO_RANGE_FULL,
+                       VideoRange::FULL,
                        weak_ptr<Content>(),
                        optional<Frame>(),
                        false