[llvm] r341067 - Build fix for r341064. Temporarily disable compile-time validation for createFileError().

[Alexandre Ganea via llvm-commits]

Author: aganea
Date: Thu Aug 30 06:36:07 2018
New Revision: 341067

URL: http://llvm.org/viewvc/llvm-project?rev=341067&view=rev
Log:
Build fix for r341064. Temporarily disable compile-time validation for createFileError().

Modified:
    llvm/trunk/include/llvm/Support/Error.h

Modified: llvm/trunk/include/llvm/Support/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Error.h?rev=341067&r1=341066&r2=341067&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Error.h (original)
+++ llvm/trunk/include/llvm/Support/Error.h Thu Aug 30 06:36:07 2018
@@ -1172,11 +1172,7 @@ Error createStringError(std::error_code
 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));
 }