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

Merge branch 'upstream-KWSys' into update-kwsys 

* upstream-KWSys:
  KWSys 2016-03-31 (3392da1d)
This commit is contained in:
Brad King 2016-03-31 08:46:50 -04:00
parent 0aa736e625 731ad1724f
commit 168e44e202
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/kwsys/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 ||