Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 4 insertions, 4 deletions

diff --git a/libsolidity/parsing/ParserBase.h b/libsolidity/parsing/ParserBase.h
index b28e1b1b..e01f37d8 100644
--- a/libsolidity/parsing/ParserBase.h
+++ b/libsolidity/parsing/ParserBase.h
@@ -63,11 +63,11 @@ protected:
 	///@{
 	///@name Helper functions
 	/// If current token value is not _value, throw exception otherwise advance token.
-	void expectToken(Token::Value _value, bool _advance = true);
-	Token::Value currentToken() const;
-	Token::Value peekNextToken() const;
+	void expectToken(Token _value, bool _advance = true);
+	Token currentToken() const;
+	Token peekNextToken() const;
 	std::string currentLiteral() const;
-	Token::Value advance();
+	Token advance();
 	///@}
 
 	/// Increases the recursion depth and throws an exception if it is too deep.