mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 23:45:27 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
JINMEI Tatuya
2012-11-29 21:06:09 -08:00
parent b48ecd894a
commit ca8fc9f414
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/dns/rdata.cc
View File

@@ -211,9 +211,9 @@ Generic::Generic(MasterLexer& lexer, const Name*,
std::string s; std::string s;
while (true) { while (true) {
const MasterLexer::Token& token = lexer.getNextToken(); const MasterToken& token = lexer.getNextToken();
if ((token.getType() == MasterLexer::Token::END_OF_FILE) || if ((token.getType() == MasterToken::END_OF_FILE) ||
(token.getType() == MasterLexer::Token::END_OF_LINE)) { (token.getType() == MasterToken::END_OF_LINE)) {
break; break;
} }

6
src/lib/dns/rrparamregistry-placeholder.cc
View File

@@ -52,9 +52,9 @@ AbstractRdataFactory::create(MasterLexer& lexer, const Name*,
std::string s; std::string s;
while (true) { while (true) {
const MasterLexer::Token& token = lexer.getNextToken(); const MasterToken& token = lexer.getNextToken();
if ((token.getType() == MasterLexer::Token::END_OF_FILE) || if ((token.getType() == MasterToken::END_OF_FILE) ||
(token.getType() == MasterLexer::Token::END_OF_LINE)) { (token.getType() == MasterToken::END_OF_LINE)) {
break; break;
} }