Commit ca8fc9f4 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2382] resolved remaining merge conflict on MasterLexer::Token.

parent b48ecd89
......@@ -211,9 +211,9 @@ Generic::Generic(MasterLexer& lexer, const Name*,
std::string s;
while (true) {
const MasterLexer::Token& token = lexer.getNextToken();
if ((token.getType() == MasterLexer::Token::END_OF_FILE) ||
(token.getType() == MasterLexer::Token::END_OF_LINE)) {
const MasterToken& token = lexer.getNextToken();
if ((token.getType() == MasterToken::END_OF_FILE) ||
(token.getType() == MasterToken::END_OF_LINE)) {
break;
}
......
......@@ -52,9 +52,9 @@ AbstractRdataFactory::create(MasterLexer& lexer, const Name*,
std::string s;
while (true) {
const MasterLexer::Token& token = lexer.getNextToken();
if ((token.getType() == MasterLexer::Token::END_OF_FILE) ||
(token.getType() == MasterLexer::Token::END_OF_LINE)) {
const MasterToken& token = lexer.getNextToken();
if ((token.getType() == MasterToken::END_OF_FILE) ||
(token.getType() == MasterToken::END_OF_LINE)) {
break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment