diff options
| author | ExMix <Rahuba.youri@gmail.com> | 2013-02-26 11:41:09 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:13 +0300 |
| commit | 38d4a3d7f6032865e9e3523568960dd9ac5629f1 (patch) | |
| tree | 47d887149f346ee75669305f1574d6d7536cb493 /coding | |
| parent | c570a06c4238277cb9fb33a500322b5a037668c4 (diff) | |
On windows platform CopyFile is define for CopyFileA or CoplyFileW. Fix for compile.
Diffstat (limited to 'coding')
| -rw-r--r-- | coding/coding_tests/file_data_test.cpp | 2 | ||||
| -rw-r--r-- | coding/internal/file_data.cpp | 2 | ||||
| -rw-r--r-- | coding/internal/file_data.hpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/coding/coding_tests/file_data_test.cpp b/coding/coding_tests/file_data_test.cpp index 85b0bcd272..039345cf71 100644 --- a/coding/coding_tests/file_data_test.cpp +++ b/coding/coding_tests/file_data_test.cpp @@ -95,7 +95,7 @@ UNIT_TEST(FileData_SharingAV_Windows) // try rename or copy to locked file TEST(!my::RenameFileX(name2, name1), ()); - TEST(!my::CopyFile(name2, name1), ()); + TEST(!my::CopyFileX(name2, name1), ()); // files should be unchanged CheckFileOK(name1); diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp index 4ebbf3eecc..5582b4f099 100644 --- a/coding/internal/file_data.cpp +++ b/coding/internal/file_data.cpp @@ -232,7 +232,7 @@ bool RenameFileX(string const & fOld, string const & fNew) return CheckRemoveResult(res, fOld); } -bool CopyFile(string const & fOld, string const & fNew) +bool CopyFileX(string const & fOld, string const & fNew) { try { diff --git a/coding/internal/file_data.hpp b/coding/internal/file_data.hpp index 5e01825312..f8e6ac336b 100644 --- a/coding/internal/file_data.hpp +++ b/coding/internal/file_data.hpp @@ -47,7 +47,7 @@ bool GetFileSize(string const & fName, uint64_t & sz); bool DeleteFileX(string const & fName); bool RenameFileX(string const & fOld, string const & fNew); /// @return false if copy fails. DO NOT THROWS exceptions -bool CopyFile(string const & fOld, string const & fNew); +bool CopyFileX(string const & fOld, string const & fNew); bool IsEqualFiles(string const & firstFile, string const & secondFile); } |