diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-31 12:46:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-31 12:46:50 (GMT) |
| commit | 168e44e2028d905272323e0a66e3735c30460f5a (patch) | |
| tree | 84fd4193bcbed903376e41a6aa74048180593916 /Source/kwsys | |
| parent | 0aa736e62545cee8e3ed6c39667705d31ce66b8c (diff) | |
| parent | 731ad1724f08fb4255664fe8e09c581ad9c062fb (diff) | |
| download | CMake-168e44e2028d905272323e0a66e3735c30460f5a.zip CMake-168e44e2028d905272323e0a66e3735c30460f5a.tar.gz CMake-168e44e2028d905272323e0a66e3735c30460f5a.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-31 (3392da1d)
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 0c7f419..c6e668d 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/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 || |