diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 9633ab130f..0e64be4aa3 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2599,7 +2599,7 @@ SystemTools::CopyStatus SystemTools::CopyAFile(std::string const& source, SystemTools::CopyWhen when) { switch (when) { - case SystemTools::CopyWhen::Always: + case SystemTools::CopyWhen::Unconditional: return SystemTools::CopyFileAlways(source, destination); case SystemTools::CopyWhen::OnlyIfDifferent: return SystemTools::CopyFileIfDifferent(source, destination); @@ -2617,7 +2617,7 @@ SystemTools::CopyStatus SystemTools::CopyAFile(std::string const& source, bool always) { return SystemTools::CopyAFile(source, destination, - always ? CopyWhen::Always + always ? CopyWhen::Unconditional : CopyWhen::OnlyIfDifferent); } @@ -2670,7 +2670,7 @@ Status SystemTools::CopyADirectory(std::string const& source, std::string const& destination, bool always) { return SystemTools::CopyADirectory(source, destination, - always ? CopyWhen::Always + always ? CopyWhen::Unconditional : CopyWhen::OnlyIfDifferent); } diff --git a/Source/kwsys/SystemTools.hxx.in b/Source/kwsys/SystemTools.hxx.in index 6397714c59..f7480558d7 100644 --- a/Source/kwsys/SystemTools.hxx.in +++ b/Source/kwsys/SystemTools.hxx.in @@ -665,7 +665,7 @@ public: enum class CopyWhen { - Always, + Unconditional, OnlyIfDifferent, OnlyIfNewer, }; @@ -675,20 +675,20 @@ public: */ static CopyStatus CopyAFile(std::string const& source, std::string const& destination, - CopyWhen when = CopyWhen::Always); + CopyWhen when = CopyWhen::Unconditional); static CopyStatus CopyAFile(std::string const& source, std::string const& destination, bool always); /** * Copy content directory to another directory with all files and * subdirectories. The "when" argument controls when files are copied: - * Always: all files are always copied. + * Unconditional: all files are always copied. * OnlyIfDifferent: only files that have changed are copied. * OnlyIfNewer: only files that are newer than the destination are copied. */ static Status CopyADirectory(std::string const& source, std::string const& destination, - CopyWhen when = CopyWhen::Always); + CopyWhen when = CopyWhen::Unconditional); static Status CopyADirectory(std::string const& source, std::string const& destination, bool always);