X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fconfig_test.cc;h=103a6a58555ac0f181353afac8f6f257c14f495d;hp=fc3a27601e4d763a646b744621652a98c3b4810a;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=b5cd81225e49fc983777dbf15a38e262fb2dd9f6 diff --git a/test/config_test.cc b/test/config_test.cc index fc3a27601..103a6a585 100644 --- a/test/config_test.cc +++ b/test/config_test.cc @@ -26,10 +26,10 @@ #include -using std::list; -using std::ofstream; using std::make_shared; +using std::ofstream; using std::string; +using std::vector; using boost::optional; @@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test) boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml"); Config::instance(); try { - /* This will fail to write cinemas.xml since the link is to a non-existant directory */ + /* This will fail to write cinemas.xml since the link is to a non-existent directory */ Config::instance()->write(); } catch (...) {} @@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE (config_keep_cinemas_if_making_new_config) Config::instance()->write(); - Config::instance()->add_cinema(make_shared("My Great Cinema", list(), "", 0, 0)); + Config::instance()->add_cinema(make_shared("My Great Cinema", vector(), "", 0, 0)); Config::instance()->write(); boost::filesystem::copy_file (dir / "cinemas.xml", dir / "backup_for_test.xml");