summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-22 10:06:10 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-22 10:06:10 +0100
commit422be0eece2bf6ee80db1d3c21553cd82efff789 (patch)
tree57604c446361be99eb092f35e703445260ada84a /test
parente34db1b3cdb5bce5ddcb112ee03664a4e463032a (diff)
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
Diffstat (limited to 'test')
-rw-r--r--test/test.cc2
-rw-r--r--test/video_content_scale_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/test.cc b/test/test.cc
index 7a759314d..3ccfd2c35 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -174,7 +174,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
- SafeStringStream error;
+ locked_stringstream error;
error << "File " << check.string() << " differs from reference " << ref.string();
while (N) {
diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index 6f5d85a11..e297d0cd2 100644
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -34,7 +34,7 @@ void
test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop crop, Ratio const * ratio, bool scale, dcp::Size correct)
{
shared_ptr<Film> film;
- SafeStringStream s;
+ locked_stringstream s;
s << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<Content>"
"<Type>FFmpeg</Type>"