From 731ad1724f08fb4255664fe8e09c581ad9c062fb Mon Sep 17 00:00:00 2001
From: KWSys Upstream <kwrobot@kitware.com>
Date: Thu, 31 Mar 2016 08:29:28 -0400
Subject: [PATCH] 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
---
 SystemTools.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 0c7f4194f..c6e668d76 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 ||