diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-04-22 15:32:57 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-04-22 15:32:57 +0800 |
| commit | dd417c73e880b63611551b38359d6033e41ca371 (patch) | |
| tree | 239b2e793a7a656ecb21bed5ebf39b7935e23845 /libsolidity/SolidityExpressionCompiler.cpp | |
| parent | 40125469256a17348fe9b8cd58cc8d59d16914b6 (diff) | |
| parent | be689e8a082e6508919d2e9ebc51a3997feaf8e6 (diff) | |
| download | dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.tar dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.tar.gz dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.tar.bz2 dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.tar.lz dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.tar.xz dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.tar.zst dexon-solidity-dd417c73e880b63611551b38359d6033e41ca371.zip | |
Merge remote-tracking branch 'upstream/develop' into gasPricerTests
Diffstat (limited to 'libsolidity/SolidityExpressionCompiler.cpp')
| -rw-r--r-- | libsolidity/SolidityExpressionCompiler.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libsolidity/SolidityExpressionCompiler.cpp b/libsolidity/SolidityExpressionCompiler.cpp index 505cac99..b2436cfa 100644 --- a/libsolidity/SolidityExpressionCompiler.cpp +++ b/libsolidity/SolidityExpressionCompiler.cpp @@ -20,8 +20,6 @@ * Unit tests for the solidity expression compiler. */ -#if ETH_SOLIDITY - #include <string> #include <libdevcore/Log.h> @@ -80,7 +78,9 @@ Declaration const& resolveDeclaration( // bracers are required, cause msvc couldnt handle this macro in for statement for (string const& namePart: _namespacedName) { - BOOST_REQUIRE(declaration = _resolver.resolveName(namePart, declaration)); + auto declarations = _resolver.resolveName(namePart, declaration); + BOOST_REQUIRE(!declarations.empty()); + BOOST_REQUIRE(declaration = *declarations.begin()); } BOOST_REQUIRE(declaration); return *declaration; @@ -491,5 +491,3 @@ BOOST_AUTO_TEST_SUITE_END() } } } // end namespaces - -#endif |