diff --git a/src/CppParser/CppParser.cpp b/src/CppParser/CppParser.cpp index 68038973..41c975c9 100644 --- a/src/CppParser/CppParser.cpp +++ b/src/CppParser/CppParser.cpp @@ -33,7 +33,7 @@ DEF_STRING(ParserTargetInfo, ABI) ParserResult::ParserResult() : ASTContext(0) , Library(0) - , Parser(0) + , CodeParser(0) { } @@ -42,12 +42,12 @@ ParserResult::ParserResult(const ParserResult& rhs) , Diagnostics(rhs.Diagnostics) , ASTContext(rhs.ASTContext) , Library(rhs.Library) - , Parser(rhs.Parser) + , CodeParser(rhs.CodeParser) {} ParserResult::~ParserResult() { - delete Parser; + delete CodeParser; } ParserDiagnostic::ParserDiagnostic() {} diff --git a/src/CppParser/CppParser.h b/src/CppParser/CppParser.h index 993b6e15..2e7b9568 100644 --- a/src/CppParser/CppParser.h +++ b/src/CppParser/CppParser.h @@ -83,7 +83,7 @@ struct CS_API ParserResult CppSharp::CppParser::AST::ASTContext* ASTContext; CppSharp::CppParser::AST::NativeLibrary* Library; - Parser* Parser; + Parser* CodeParser; }; enum class SourceLocationKind diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index 93457a61..d279c301 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -2940,8 +2940,8 @@ ParserResult* ClangParser::ParseHeader(ParserOptions* Opts) return nullptr; auto res = new ParserResult(); - res->Parser = new Parser(Opts); - return res->Parser->ParseHeader(Opts->FileName, res); + res->CodeParser = new Parser(Opts); + return res->CodeParser->ParseHeader(Opts->FileName, res); } ParserResult* ClangParser::ParseLibrary(ParserOptions* Opts) @@ -2950,8 +2950,8 @@ ParserResult* ClangParser::ParseLibrary(ParserOptions* Opts) return nullptr; auto res = new ParserResult(); - res->Parser = new Parser(Opts); - return res->Parser->ParseLibrary(Opts->FileName, res); + res->CodeParser = new Parser(Opts); + return res->CodeParser->ParseLibrary(Opts->FileName, res); } ParserTargetInfo* ClangParser::GetTargetInfo(ParserOptions* Opts)