From a2f7ed7035b38a13c65c04fa3b626197bd9d360a Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 16 Dec 2004 23:00:05 +0000 Subject: [PATCH] For PR351: * Remove the "removeFile" function, now implemented by the sys::Path::destroyFile method. * Make the FileRemove work with a sys::Path instead of a std::string git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18999 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FileUtilities.h | 13 +++++-------- lib/Support/FileUtilities.cpp | 7 ------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/include/llvm/Support/FileUtilities.h b/include/llvm/Support/FileUtilities.h index c594ac9899c..6459cc9ad76 100644 --- a/include/llvm/Support/FileUtilities.h +++ b/include/llvm/Support/FileUtilities.h @@ -15,7 +15,7 @@ #ifndef LLVM_SUPPORT_FILEUTILITIES_H #define LLVM_SUPPORT_FILEUTILITIES_H -#include +#include "llvm/System/Path.h" namespace llvm { @@ -34,10 +34,6 @@ bool DiffFiles(const std::string &FileA, const std::string &FileB, /// void MoveFileOverIfUpdated(const std::string &New, const std::string &Old); -/// removeFile - Delete the specified file. -/// -void removeFile(const std::string &Filename); - /// FDHandle - Simple handle class to make sure a file descriptor gets closed /// when the object is destroyed. This handle acts similarly to an /// std::auto_ptr, in that the copy constructor and assignment operators @@ -81,14 +77,15 @@ public: /// specified (if deleteIt is true). /// class FileRemover { - std::string Filename; + sys::Path Filename; bool DeleteIt; public: - FileRemover(const std::string &filename, bool deleteIt = true) + FileRemover(const sys::Path &filename, bool deleteIt = true) : Filename(filename), DeleteIt(deleteIt) {} ~FileRemover() { - if (DeleteIt) removeFile(Filename); + if (DeleteIt) + Filename.destroyFile(); } /// releaseFile - Take ownership of the file away from the FileRemover so it diff --git a/lib/Support/FileUtilities.cpp b/lib/Support/FileUtilities.cpp index b1924662e43..8f4917bae9a 100644 --- a/lib/Support/FileUtilities.cpp +++ b/lib/Support/FileUtilities.cpp @@ -64,13 +64,6 @@ void llvm::MoveFileOverIfUpdated(const std::string &New, } } -/// removeFile - Delete the specified file -/// -void llvm::removeFile(const std::string &Filename) { - std::remove(Filename.c_str()); -} - - //===----------------------------------------------------------------------===// // FDHandle class implementation //