Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler

Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
	libsolidity/Compiler.cpp
	libsolidity/Compiler.h
	libsolidity/NameAndTypeResolver.h
	libsolidity/Types.cpp
	solc/main.cpp
	test/solidityCompiler.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/Scanner.h b/Scanner.h
index 7754d71b..c2dfb476 100644
--- a/Scanner.h
+++ b/Scanner.h
@@ -125,7 +125,7 @@ public:
 	/// Returns the current token
 	Token::Value getCurrentToken() { return m_current_token.token; }
 	Location getCurrentLocation() const { return m_current_token.location; }
-	const std::string& getCurrentLiteral() const { return m_current_token.literal; }
+	std::string const& getCurrentLiteral() const { return m_current_token.literal; }
 	///@}
 
 	///@{
@@ -134,7 +134,7 @@ public:
 	/// Returns the next token without advancing input.
 	Token::Value peekNextToken() const { return m_next_token.token; }
 	Location peekLocation() const { return m_next_token.location; }
-	const std::string& peekLiteral() const { return m_next_token.literal; }
+	std::string const& peekLiteral() const { return m_next_token.literal; }
 	///@}
 
 	///@{