maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Build fix for r341064. Temporarily disable compile-time validation for createFileError(). 

llvm-svn: 341067
This commit is contained in:
Alexandre Ganea 2018-08-30 13:36:07 +00:00
parent a2f146fd9c
commit ca49e391b3
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/Support/Error.h
View File

@ -1172,11 +1172,7 @@ Error createStringError(std::error_code EC, char const *Msg);
class FileError final : public ErrorInfo<FileError> {
template <class Err>
friend Error createFileError(
std::string, Err,
typename std::enable_if<std::is_base_of<Error, Err>::value &&
!std::is_base_of<ErrorSuccess, Err>::value>::type
*);
friend Error createFileError(std::string, Err);
public:
void log(raw_ostream &OS) const override {
@ -1212,11 +1208,7 @@ private:
/// Concatenate a source file path and/or name with an Error. The resulting
/// Error is unchecked.
template <class Err>
inline Error createFileError(
std::string F, Err E,
typename std::enable_if<std::is_base_of<Error, Err>::value &&
!std::is_base_of<ErrorSuccess, Err>::value>::type
* = nullptr) {
inline Error createFileError(std::string F, Err E) {
return FileError::build(F, std::move(E));
}