diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2016-03-31 12:29:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-31 12:46:49 (GMT) |
| commit | 731ad1724f08fb4255664fe8e09c581ad9c062fb (patch) | |
| tree | 86798b484a9fbf16a15556cb8135e365c5db5747 | |
| parent | 735c41ddb021a5ca0e8957591447acdb28a0f41b (diff) | |
| download | CMake-731ad1724f08fb4255664fe8e09c581ad9c062fb.zip CMake-731ad1724f08fb4255664fe8e09c581ad9c062fb.tar.gz CMake-731ad1724f08fb4255664fe8e09c581ad9c062fb.tar.bz2 | |
KWSys 2016-03-31 (3392da1d)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 3392da1df3c363d6d1a80fa3f0e49fbd45c9dcf7 (master).
Upstream Shortlog
-----------------
Ben Boeckel (2):
f6867bb7 SystemTools: flip junction deletion around
3392da1d SystemTools: add buffer around preproc conditions
| -rw-r--r-- | SystemTools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx index 0c7f419..c6e668d 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -2855,6 +2855,7 @@ static bool DeleteJunction(const std::wstring& source) return false; #endif } + #endif bool SystemTools::RemoveFile(const std::string& source) @@ -2884,9 +2885,9 @@ bool SystemTools::RemoveFile(const std::string& source) SetLastError(err); return false; } - if (IsJunction(ws) && !DeleteJunction(ws)) + if (IsJunction(ws) && DeleteJunction(ws)) { - return false; + return true; } if (DeleteFileW(ws.c_str()) || GetLastError() == ERROR_FILE_NOT_FOUND || |