Merge pull request #5571 from ethereum/develop

Version 0.5.1

1 files changed, 4 insertions, 3 deletions

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index ec98026c..bd24115c 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -23,11 +23,11 @@
 #include <test/Options.h>
 
 #include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/SourceReferenceFormatter.h>
+#include <liblangutil/SourceReferenceFormatter.h>
 
 #include <libsolidity/ast/AST.h>
 
-#include <libsolidity/parsing/Scanner.h>
+#include <liblangutil/Scanner.h>
 
 #include <libdevcore/Keccak256.h>
 
@@ -35,6 +35,7 @@
 
 using namespace std;
 using namespace dev;
+using namespace langutil;
 using namespace dev::solidity;
 using namespace dev::solidity::test;
 
@@ -127,7 +128,7 @@ string AnalysisFramework::formatError(Error const& _error) const
 	return SourceReferenceFormatter::formatExceptionInformation(
 			_error,
 			(_error.type() == Error::Type::Warning) ? "Warning" : "Error",
-			[&](std::string const& _sourceName) -> solidity::Scanner const& { return m_compiler.scanner(_sourceName); }
+			[&](std::string const& _sourceName) -> Scanner const& { return m_compiler.scanner(_sourceName); }
 		);
 }