diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-24 11:40:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-24 14:28:32 +0100 |
| commit | 1a693725f9a8cc6ba58f65b2f1ef03255d295f23 (patch) | |
| tree | 91596f7800dcc02103c90f8f19c763f45281603e /test | |
| parent | a03e9a98ed667eb44c9dfbbeaf6da57f44992914 (diff) | |
Basic template support (#485).
Diffstat (limited to 'test')
| -rw-r--r-- | test/ffmpeg_dcp_test.cc | 2 | ||||
| -rw-r--r-- | test/srt_subtitle_test.cc | 2 | ||||
| -rw-r--r-- | test/ssa_subtitle_test.cc | 2 | ||||
| -rw-r--r-- | test/test.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index a28119110..748695efe 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test) { boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test"); - shared_ptr<Film> film (new Film (p.string ())); + shared_ptr<Film> film (new Film (p)); film->read_metadata (); BOOST_CHECK (!film->cpls().empty()); diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc index d29a91ed2..f733567d5 100644 --- a/test/srt_subtitle_test.cc +++ b/test/srt_subtitle_test.cc @@ -87,7 +87,7 @@ check_subtitle_file (shared_ptr<Film> film, boost::filesystem::path ref) { /* Find the subtitle file and check it */ for ( - boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory() / film->dcp_name (false)); + boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false)); i != boost::filesystem::directory_iterator (); ++i) { diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc index f6c65b1af..ed8c20424 100644 --- a/test/ssa_subtitle_test.cc +++ b/test/ssa_subtitle_test.cc @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1) /* Find the subtitle file and check it */ for ( - boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory() / film->dcp_name (false)); + boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false)); i != boost::filesystem::directory_iterator (); ++i) { diff --git a/test/test.cc b/test/test.cc index 0b98f7b82..86dddbeda 100644 --- a/test/test.cc +++ b/test/test.cc @@ -112,7 +112,7 @@ new_test_film (string name) 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; } |