Author: Shivam Date: 2022-06-15T00:45:07+05:30 New Revision: 6ccc2733e72017999a94c10147a71ff595286080
URL: https://github.com/llvm/llvm-project/commit/6ccc2733e72017999a94c10147a71ff595286080 DIFF: https://github.com/llvm/llvm-project/commit/6ccc2733e72017999a94c10147a71ff595286080.diff LOG: Update ASTImportError.h Added: Modified: clang/include/clang/AST/ASTImportError.h Removed: ################################################################################ diff --git a/clang/include/clang/AST/ASTImportError.h b/clang/include/clang/AST/ASTImportError.h index b33d8817e521..405790b6ded3 100644 --- a/clang/include/clang/AST/ASTImportError.h +++ b/clang/include/clang/AST/ASTImportError.h @@ -18,11 +18,8 @@ namespace clang { -<<<<<<< HEAD class ASTImportError : public llvm::ErrorInfo<ASTImportError> { -======= -class ImportError : public llvm::ErrorInfo<ImportError> { ->>>>>>> 4bf928bce44adda059aba715664c41462536d483 + public: /// \brief Kind of error when importing an AST component. enum ErrorKind { @@ -35,7 +32,6 @@ class ImportError : public llvm::ErrorInfo<ImportError> { static char ID; -<<<<<<< HEAD ASTImportError() : Error(Unknown) {} ASTImportError(const ASTImportError &Other) : Error(Other.Error) {} ASTImportError &operator=(const ASTImportError &Other) { @@ -43,15 +39,6 @@ class ImportError : public llvm::ErrorInfo<ImportError> { return *this; } ASTImportError(ErrorKind Error) : Error(Error) {} -======= - ImportError() : Error(Unknown) {} - ImportError(const ImportError &Other) : Error(Other.Error) {} - ImportError &operator=(const ImportError &Other) { - Error = Other.Error; - return *this; - } - ImportError(ErrorKind Error) : Error(Error) {} ->>>>>>> 4bf928bce44adda059aba715664c41462536d483 std::string toString() const; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
