From ca8fc9f4147a8f332280fde6cfad99b963ebc40a Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Thu, 29 Nov 2012 21:06:09 -0800 Subject: [PATCH] [2382] resolved remaining merge conflict on MasterLexer::Token. --- src/lib/dns/rdata.cc | 6 +++--- src/lib/dns/rrparamregistry-placeholder.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/dns/rdata.cc b/src/lib/dns/rdata.cc index f8deec6d22..46224c65b8 100644 --- a/src/lib/dns/rdata.cc +++ b/src/lib/dns/rdata.cc @@ -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; } diff --git a/src/lib/dns/rrparamregistry-placeholder.cc b/src/lib/dns/rrparamregistry-placeholder.cc index e35b2f4664..cea5b26a83 100644 --- a/src/lib/dns/rrparamregistry-placeholder.cc +++ b/src/lib/dns/rrparamregistry-placeholder.cc @@ -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; }