summaryrefslogtreecommitdiffstats
path: root/src/lib/dns/tests/master_lexer_token_unittest.cc
diff options
context:
space:
mode:
authorJINMEI Tatuya <jinmei@isc.org>2012-11-29 19:06:01 +0100
committerJINMEI Tatuya <jinmei@isc.org>2012-11-29 19:06:01 +0100
commitf70d131fd20085a472de32f86299a77647f18fd5 (patch)
tree956379c2b68924c6353e1f00e4169ce752ee0a64 /src/lib/dns/tests/master_lexer_token_unittest.cc
parent[2506] added another version of getNextToken, basic part (diff)
downloadkea-f70d131fd20085a472de32f86299a77647f18fd5.tar.xz
kea-f70d131fd20085a472de32f86299a77647f18fd5.zip
[2506] resolved remaining conflicts on rebase
Diffstat (limited to 'src/lib/dns/tests/master_lexer_token_unittest.cc')
-rw-r--r--src/lib/dns/tests/master_lexer_token_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/dns/tests/master_lexer_token_unittest.cc b/src/lib/dns/tests/master_lexer_token_unittest.cc
index 0fc7ff9519..7cb83a5fa8 100644
--- a/src/lib/dns/tests/master_lexer_token_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_token_unittest.cc
@@ -139,7 +139,7 @@ TEST_F(MasterLexerTokenTest, errors) {
EXPECT_EQ("no token produced", MasterToken(MasterToken::NO_TOKEN_PRODUCED).
getErrorText());
EXPECT_EQ("number out of range",
- MasterLexer::Token(MasterToken::NUMBER_OUT_OF_RANGE).
+ MasterToken(MasterToken::NUMBER_OUT_OF_RANGE).
getErrorText());
// getErrorCode/Text() isn't allowed for non number types