From adae04e0984d294aa9a95394bfed584ce7e93469 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 Sep 2024 23:12:41 +0200 Subject: Fix the boost copy_option{,s} change a different way. The previous solution required the correct define to be present when including libdcp, which seems a bit awkward. --- src/filesystem.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/filesystem.h') diff --git a/src/filesystem.h b/src/filesystem.h index 679be1f9..a06dc69e 100644 --- a/src/filesystem.h +++ b/src/filesystem.h @@ -51,11 +51,14 @@ boost::filesystem::path change_extension(boost::filesystem::path const& from, st void copy(boost::filesystem::path const& from, boost::filesystem::path const& to); void copy_file(boost::filesystem::path const& from, boost::filesystem::path const& to); void copy_file(boost::filesystem::path const& from, boost::filesystem::path const& to, boost::system::error_code& ec); -#ifdef LIBDCP_HAVE_COPY_OPTIONS -void copy_file(boost::filesystem::path const& from, boost::filesystem::path const& to, boost::filesystem::copy_options ec); -#else -void copy_file(boost::filesystem::path const& from, boost::filesystem::path const& to, boost::filesystem::copy_option ec); -#endif + +enum class CopyOptions +{ + NONE, + OVERWRITE_EXISTING +}; + +void copy_file(boost::filesystem::path const& from, boost::filesystem::path const& to, CopyOptions options); bool create_directory(boost::filesystem::path const& path); bool create_directory(boost::filesystem::path const& path, boost::system::error_code& ec); bool create_directories(boost::filesystem::path const& path); -- cgit v1.2.3