X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fstate.cc;fp=src%2Flib%2Fstate.cc;h=f345d119e1515f4d7a0aaa72e53486d1a1338e16;hb=96f50dd5e600925488fdd9db1580aa01b026269b;hp=e22f9e0b98bd71d37f4e6947d1563b1b6afd01c2;hpb=94a9473993b027b9368077009decbdd4322f90e3;p=dcpomatic.git diff --git a/src/lib/state.cc b/src/lib/state.cc index e22f9e0b9..f345d119e 100644 --- a/src/lib/state.cc +++ b/src/lib/state.cc @@ -22,6 +22,7 @@ #include "cross.h" #include "state.h" #include "util.h" +#include #include @@ -60,11 +61,9 @@ config_path_or_override (optional version) boost::filesystem::path State::read_path (string file) { - using namespace boost::filesystem; - for (auto i: config_versions) { auto full = config_path_or_override(i) / file; - if (exists(full)) { + if (dcp::filesystem::exists(full)) { return full; } } @@ -79,9 +78,9 @@ State::read_path (string file) boost::filesystem::path State::write_path (string file) { - boost::filesystem::path p = config_path_or_override(config_versions.front()); + auto p = config_path_or_override(config_versions.front()); boost::system::error_code ec; - boost::filesystem::create_directories (p, ec); + dcp::filesystem::create_directories(p, ec); p /= file; return p; }