summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorAlexandre Ganea <alexandre.ganea@ubisoft.com>2018-08-30 13:36:07 +0000
committerAlexandre Ganea <alexandre.ganea@ubisoft.com>2018-08-30 13:36:07 +0000
commitca49e391b3428a20b4924bafebd50dbd5f4f5ec1 (patch)
tree16bc7c6fde9f30826bcdcf2b53522c9c5998cef2 /llvm
parenta2f146fd9cf52f88f2996ebd4ecb0f5ff9c0c6a6 (diff)
downloadbcm5719-llvm-ca49e391b3428a20b4924bafebd50dbd5f4f5ec1.tar.gz
bcm5719-llvm-ca49e391b3428a20b4924bafebd50dbd5f4f5ec1.zip
Build fix for r341064. Temporarily disable compile-time validation for createFileError().
llvm-svn: 341067
Diffstat (limited to 'llvm')
-rw-r--r--llvm/include/llvm/Support/Error.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h
index 9c49fa989e0..3ee59b9309f 100644
--- a/llvm/include/llvm/Support/Error.h
+++ b/llvm/include/llvm/Support/Error.h
@@ -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));
}
OpenPOWER on IntegriCloud