diff options
| author | chriseth <chris@ethereum.org> | 2018-12-03 22:48:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 22:48:03 +0800 |
| commit | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (patch) | |
| tree | 7977e9dcbbc215088c05b847f849871ef5d4ae66 /test/libsolidity/SolidityExecutionFramework.h | |
| parent | 1d4f565a64988a3400847d2655ca24f73f234bc6 (diff) | |
| parent | 590be1d84cea9850ce69b68be3dc5294b39041e5 (diff) | |
| download | dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.gz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.bz2 dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.lz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.xz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.zst dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.zip | |
Merge pull request #5571 from ethereum/develop
Version 0.5.1
Diffstat (limited to 'test/libsolidity/SolidityExecutionFramework.h')
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index 12687dd1..cedbf51a 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -27,8 +27,8 @@ #include <test/ExecutionFramework.h> #include <libsolidity/interface/CompilerStack.h> -#include <libsolidity/interface/Exceptions.h> -#include <libsolidity/interface/SourceReferenceFormatter.h> +#include <liblangutil/Exceptions.h> +#include <liblangutil/SourceReferenceFormatter.h> namespace dev { @@ -72,13 +72,13 @@ public: m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns); if (!m_compiler.compile()) { - auto scannerFromSourceName = [&](std::string const& _sourceName) -> solidity::Scanner const& { return m_compiler.scanner(_sourceName); }; - SourceReferenceFormatter formatter(std::cerr, scannerFromSourceName); + auto scannerFromSourceName = [&](std::string const& _sourceName) -> langutil::Scanner const& { return m_compiler.scanner(_sourceName); }; + langutil::SourceReferenceFormatter formatter(std::cerr, scannerFromSourceName); for (auto const& error: m_compiler.errors()) formatter.printExceptionInformation( *error, - (error->type() == Error::Type::Warning) ? "Warning" : "Error" + (error->type() == langutil::Error::Type::Warning) ? "Warning" : "Error" ); BOOST_ERROR("Compiling contract failed"); } |