diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-17 14:28:33 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-17 14:28:33 +0000 |
| commit | 3fd44a109d5e66b45e516831ef21da6c155b3089 (patch) | |
| tree | 0be6ac26cdc4d60c11c7b53cb34d3415b1726b96 /llvm/lib/Support/Windows | |
| parent | 54989e78e4e4b7d875e183688457a6b6d7530b80 (diff) | |
| download | bcm5719-llvm-3fd44a109d5e66b45e516831ef21da6c155b3089.tar.gz bcm5719-llvm-3fd44a109d5e66b45e516831ef21da6c155b3089.zip | |
Merging r338841:
------------------------------------------------------------------------
r338841 | jmorse | 2018-08-03 12:13:35 +0200 (Fri, 03 Aug 2018) | 11 lines
[Windows FS] Allow moving files in TempFile::keep
In r338216 / D49860 TempFile::keep was extended to allow keeping across
filesystems. The aim on Windows was to have this happen in rename_internal
using the existing system API. However, to fix an issue and preserve the
idea of "renaming" not being a move, put Windows keep-across-filesystem in
TempFile::keep.
Differential Revision: https://reviews.llvm.org/D50048
------------------------------------------------------------------------
llvm-svn: 340030
Diffstat (limited to 'llvm/lib/Support/Windows')
| -rw-r--r-- | llvm/lib/Support/Windows/Path.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc index b64b013d740..f425d607af4 100644 --- a/llvm/lib/Support/Windows/Path.inc +++ b/llvm/lib/Support/Windows/Path.inc @@ -450,7 +450,7 @@ static std::error_code rename_handle(HANDLE FromHandle, const Twine &To) { if (std::error_code EC2 = realPathFromHandle(FromHandle, WideFrom)) return EC2; if (::MoveFileExW(WideFrom.begin(), WideTo.begin(), - MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED)) + MOVEFILE_REPLACE_EXISTING)) return std::error_code(); return mapWindowsError(GetLastError()); } |
