RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Revert "r372201: [Support] Replace function with function_ref in writeFileAtomically. NFC"

Browse Source 
function_ref causes calls to the function to be ambiguous, breaking
compilation.

Reverting for now.

llvm-svn: 372202
This commit is contained in:
Ilya Biryukov 2019-09-18 08:47:09 +00:00
parent 5e10e7bc8c
commit 93a7fe8d08
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Support/FileUtilities.h
View File

@ -14,7 +14,6 @@
#ifndef LLVM_SUPPORT_FILEUTILITIES_H #ifndef LLVM_SUPPORT_FILEUTILITIES_H
#define LLVM_SUPPORT_FILEUTILITIES_H #define LLVM_SUPPORT_FILEUTILITIES_H
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "llvm/Support/Errc.h" #include "llvm/Support/Errc.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
@ -108,9 +107,9 @@ namespace llvm {
llvm::Error writeFileAtomically(StringRef TempPathModel, StringRef FinalPath, llvm::Error writeFileAtomically(StringRef TempPathModel, StringRef FinalPath,
StringRef Buffer); StringRef Buffer);
llvm::Error writeFileAtomically( llvm::Error
StringRef TempPathModel, StringRef FinalPath, writeFileAtomically(StringRef TempPathModel, StringRef FinalPath,
llvm::function_ref<llvm::Error(llvm::raw_ostream &)> Writer); std::function<llvm::Error(llvm::raw_ostream &)> Writer);
} // End llvm namespace } // End llvm namespace
#endif #endif

2
lib/Support/FileUtilities.cpp
View File

@ -296,7 +296,7 @@ llvm::Error llvm::writeFileAtomically(StringRef TempPathModel,
llvm::Error llvm::writeFileAtomically( llvm::Error llvm::writeFileAtomically(
StringRef TempPathModel, StringRef FinalPath, StringRef TempPathModel, StringRef FinalPath,
llvm::function_ref<llvm::Error(llvm::raw_ostream &)> Writer) { std::function<llvm::Error(llvm::raw_ostream &)> Writer) {
SmallString<128> GeneratedUniqPath; SmallString<128> GeneratedUniqPath;
int TempFD; int TempFD;
if (sys::fs::createUniqueFile(TempPathModel.str(), TempFD, if (sys::fs::createUniqueFile(TempPathModel.str(), TempFD,