kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
KWSys Upstream 2016-03-31 08:29:28 -04:00 committed by Brad King
parent 735c41ddb0
commit 731ad1724f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SystemTools.cxx
View File

@ -2855,6 +2855,7 @@ static bool DeleteJunction(const std::wstring& source)
return false; return false;
#endif #endif
} }
#endif #endif
bool SystemTools::RemoveFile(const std::string& source) bool SystemTools::RemoveFile(const std::string& source)
@ -2884,9 +2885,9 @@ bool SystemTools::RemoveFile(const std::string& source)
SetLastError(err); SetLastError(err);
return false; return false;
} }
if (IsJunction(ws) && !DeleteJunction(ws)) if (IsJunction(ws) && DeleteJunction(ws))
{ {
return false; return true;
} }
if (DeleteFileW(ws.c_str()) || if (DeleteFileW(ws.c_str()) ||
GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_FILE_NOT_FOUND ||