projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic template support (#485).
[dcpomatic.git]
/
test
/
test.cc
diff --git
a/test/test.cc
b/test/test.cc
index 7a759314d8ba4713a7333b32856889746f662044..86dddbeda07c6c8cbf47e52649f6d5abf3974e01 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-112,7
+112,7
@@
new_test_film (string name)
boost::filesystem::remove_all (p);
}
boost::filesystem::remove_all (p);
}
- shared_ptr<Film> film = shared_ptr<Film> (new Film (p
.string()
));
+ shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
film->write_metadata ();
return film;
}
film->write_metadata ();
return film;
}
@@
-174,8
+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];
uint8_t* ref_buffer = new uint8_t[buffer_size];
uint8_t* check_buffer = new uint8_t[buffer_size];
- SafeStringStream error;
- error << "File " << check.string() << " differs from reference " << ref.string();
+ string error = "File " + check.string() + " differs from reference " + ref.string();
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
while (N) {
uintmax_t this_time = min (uintmax_t (buffer_size), N);
@@
-184,7
+183,7
@@
check_file (boost::filesystem::path ref, boost::filesystem::path check)
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
r = fread (check_buffer, 1, this_time, check_file);
BOOST_CHECK_EQUAL (r, this_time);
- BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error
.str ()
);
+ BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}
if (memcmp (ref_buffer, check_buffer, this_time)) {
break;
}