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

diff --git a/src/lib/dns/rdata.cc b/src/lib/dns/rdata.cc
index f8deec6d22a9c381f4dae2f0c49ae02141184897..46224c65b8b281c232963d26892e445cb1bb1a80 100644 (file)
--- 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 e35b2f46644d57f0ed8f66b527aa5d0c4d42f244..cea5b26a83b13f8376f7b63da85a1fd2e32cd048 100644 (file)
--- 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;
         }