Skip to content

Commit ca49e39

Browse files
committed
Build fix for r341064. Temporarily disable compile-time validation for createFileError().
llvm-svn: 341067
1 parent a2f146f commit ca49e39

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

llvm/include/llvm/Support/Error.h

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,11 +1172,7 @@ Error createStringError(std::error_code EC, char const *Msg);
11721172
class FileError final : public ErrorInfo<FileError> {
11731173

11741174
template <class Err>
1175-
friend Error createFileError(
1176-
std::string, Err,
1177-
typename std::enable_if<std::is_base_of<Error, Err>::value &&
1178-
!std::is_base_of<ErrorSuccess, Err>::value>::type
1179-
*);
1175+
friend Error createFileError(std::string, Err);
11801176

11811177
public:
11821178
void log(raw_ostream &OS) const override {
@@ -1212,11 +1208,7 @@ class FileError final : public ErrorInfo<FileError> {
12121208
/// Concatenate a source file path and/or name with an Error. The resulting
12131209
/// Error is unchecked.
12141210
template <class Err>
1215-
inline Error createFileError(
1216-
std::string F, Err E,
1217-
typename std::enable_if<std::is_base_of<Error, Err>::value &&
1218-
!std::is_base_of<ErrorSuccess, Err>::value>::type
1219-
* = nullptr) {
1211+
inline Error createFileError(std::string F, Err E) {
12201212
return FileError::build(F, std::move(E));
12211213
}
12221214

0 commit comments

Comments
 (0)