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

Update ASTImportError.h

This commit is contained in:
Shivam 2022-06-15 00:45:07 +05:30 committed by GitHub
parent caf2767c47
commit 6ccc2733e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/include/clang/AST/ASTImportError.h
View File

@ -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 @@ public:
static char ID;
<<<<<<< HEAD
ASTImportError() : Error(Unknown) {}
ASTImportError(const ASTImportError &Other) : Error(Other.Error) {}
ASTImportError &operator=(const ASTImportError &Other) {
@ -43,15 +39,6 @@ public:
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;