diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2019-09-18 08:47:09 +0000 |
|---|---|---|
| committer | Ilya Biryukov <ibiryukov@google.com> | 2019-09-18 08:47:09 +0000 |
| commit | 377aaa2ede8ce0bc73a85fb2f3b29cd07d79535c (patch) | |
| tree | 7b81e016ff4f4fd355ba1afb9348e3afe7c3ba33 | |
| parent | edd5dfcd890dad921bb0c0edb1551597bd6124d7 (diff) | |
| download | bcm5719-llvm-377aaa2ede8ce0bc73a85fb2f3b29cd07d79535c.tar.gz bcm5719-llvm-377aaa2ede8ce0bc73a85fb2f3b29cd07d79535c.zip | |
Revert "r372201: [Support] Replace function with function_ref in writeFileAtomically. NFC"
function_ref causes calls to the function to be ambiguous, breaking
compilation.
Reverting for now.
llvm-svn: 372202
| -rw-r--r-- | llvm/include/llvm/Support/FileUtilities.h | 7 | ||||
| -rw-r--r-- | llvm/lib/Support/FileUtilities.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/llvm/include/llvm/Support/FileUtilities.h b/llvm/include/llvm/Support/FileUtilities.h index d661c5cbc03..04efdced32a 100644 --- a/llvm/include/llvm/Support/FileUtilities.h +++ b/llvm/include/llvm/Support/FileUtilities.h @@ -14,7 +14,6 @@ #ifndef LLVM_SUPPORT_FILEUTILITIES_H #define LLVM_SUPPORT_FILEUTILITIES_H -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Errc.h" #include "llvm/Support/ErrorHandling.h" @@ -108,9 +107,9 @@ namespace llvm { llvm::Error writeFileAtomically(StringRef TempPathModel, StringRef FinalPath, StringRef Buffer); - llvm::Error writeFileAtomically( - StringRef TempPathModel, StringRef FinalPath, - llvm::function_ref<llvm::Error(llvm::raw_ostream &)> Writer); + llvm::Error + writeFileAtomically(StringRef TempPathModel, StringRef FinalPath, + std::function<llvm::Error(llvm::raw_ostream &)> Writer); } // End llvm namespace #endif diff --git a/llvm/lib/Support/FileUtilities.cpp b/llvm/lib/Support/FileUtilities.cpp index 3d862f5f09e..d11fbb54dc0 100644 --- a/llvm/lib/Support/FileUtilities.cpp +++ b/llvm/lib/Support/FileUtilities.cpp @@ -296,7 +296,7 @@ llvm::Error llvm::writeFileAtomically(StringRef TempPathModel, llvm::Error llvm::writeFileAtomically( StringRef TempPathModel, StringRef FinalPath, - llvm::function_ref<llvm::Error(llvm::raw_ostream &)> Writer) { + std::function<llvm::Error(llvm::raw_ostream &)> Writer) { SmallString<128> GeneratedUniqPath; int TempFD; if (sys::fs::createUniqueFile(TempPathModel.str(), TempFD, |
