Undo most of r54519.

[oota-llvm.git] / include / llvm / Support / FileUtilities.h

diff --git a/include/llvm/Support/FileUtilities.h b/include/llvm/Support/FileUtilities.h
index 6712c325763a95f52adbab44219957497b9c803d..44c699faa56b9a18bd36850c8ee929c760a70813 100644 (file)
--- a/include/llvm/Support/FileUtilities.h
+++ b/include/llvm/Support/FileUtilities.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -26,7 +26,8 @@ namespace llvm {
   /// option, it will set the string to an error message if an error occurs, or
   /// if the files are different.
   ///
-  int DiffFilesWithTolerance(const sys::Path &FileA, const sys::Path &FileB,
+  int DiffFilesWithTolerance(const sys::PathWithStatus &FileA, 
+                             const sys::PathWithStatus &FileB,
                              double AbsTol, double RelTol,
                              std::string *Error = 0);
 
@@ -39,14 +40,14 @@ namespace llvm {
     sys::Path Filename;
     bool DeleteIt;
   public:
-    FileRemover(const sys::Path &filename, bool deleteIt = true)
+    explicit FileRemover(const sys::Path &filename, bool deleteIt = true)
       : Filename(filename), DeleteIt(deleteIt) {}
 
     ~FileRemover() {
-      if (DeleteIt)
-        try {
-          Filename.destroyFile();
-        } catch (...) {}             // Ignore problems deleting the file.
+      if (DeleteIt) {
+        // Ignore problems deleting the file.
+        Filename.eraseFromDisk();
+      }
     }
 
     /// releaseFile - Take ownership of the file away from the FileRemover so it