diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-07-10 02:02:19 +0200 |
| commit | 5b0e331380c83ec9835e8aa42fd342b2f0ad275d (patch) | |
| tree | 13c27f0b3420f5c3a268a5a22a9172675fdc370c /test/cpl_hash_test.cc | |
| parent | 5d838bc863a7569e68546026c109607fd5a94362 (diff) | |
Use dcp::compose rather than our own.compose
Diffstat (limited to 'test/cpl_hash_test.cc')
| -rw-r--r-- | test/cpl_hash_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpl_hash_test.cc b/test/cpl_hash_test.cc index f34c29583..0e57d54e4 100644 --- a/test/cpl_hash_test.cc +++ b/test/cpl_hash_test.cc @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test) make_and_verify_dcp (ov); /* Remove <Hash> tags from the CPL */ - for (auto i: directory_iterator(String::compose("build/test/%1/%2", ov_name, ov->dcp_name()))) { + for (auto i: directory_iterator(dcp::compose("build/test/%1/%2", ov_name, ov->dcp_name()))) { if (boost::algorithm::starts_with(i.path().filename().string(), "cpl_")) { auto in = fopen_boost(i.path(), "r"); BOOST_REQUIRE (in); @@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test) } string const vf_name = "hash_added_to_imported_dcp_test_vf"; - auto ov_content = make_shared<DCPContent>(String::compose("build/test/%1/%2", ov_name, ov->dcp_name())); + auto ov_content = make_shared<DCPContent>(dcp::compose("build/test/%1/%2", ov_name, ov->dcp_name())); auto vf = new_test_film2 ( vf_name, { ov_content } ); @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test) /* Check for Hash tags in the VF DCP */ int hashes = 0; - for (auto i: directory_iterator(String::compose("build/test/%1/%2", vf_name, vf->dcp_name()))) { + for (auto i: directory_iterator(dcp::compose("build/test/%1/%2", vf_name, vf->dcp_name()))) { if (boost::algorithm::starts_with(i.path().filename().string(), "cpl_")) { auto in = fopen_boost(i.path(), "r"); BOOST_REQUIRE (in); |