diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-03-07 02:35:46 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-03-07 02:35:46 +0800 |
| commit | 2f699b222b4d687f1b63ea8c1fefa190d4e45069 (patch) | |
| tree | e10cc4c1a77754e44fcac4b797f2c2d201d52276 /SolidityExpressionCompiler.cpp | |
| parent | 3726e267a825d82c7d576b733732b87cbb336a71 (diff) | |
| parent | 0f6224a70f0e53ef88c97f595c1607b164ff7834 (diff) | |
| download | dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.tar dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.tar.gz dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.tar.bz2 dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.tar.lz dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.tar.xz dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.tar.zst dexon-solidity-2f699b222b4d687f1b63ea8c1fefa190d4e45069.zip | |
Merge branch 'develop' into new_jsonrpc
Diffstat (limited to 'SolidityExpressionCompiler.cpp')
| -rw-r--r-- | SolidityExpressionCompiler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/SolidityExpressionCompiler.cpp b/SolidityExpressionCompiler.cpp index 3340334f..7034085e 100644 --- a/SolidityExpressionCompiler.cpp +++ b/SolidityExpressionCompiler.cpp @@ -30,7 +30,7 @@ #include <libsolidity/CompilerContext.h> #include <libsolidity/ExpressionCompiler.h> #include <libsolidity/AST.h> -#include <boost/test/unit_test.hpp> +#include "TestHelper.h" using namespace std; @@ -72,8 +72,8 @@ private: Expression* m_expression; }; -Declaration const& resolveDeclaration(vector<string> const& _namespacedName, - NameAndTypeResolver const& _resolver) +Declaration const& resolveDeclaration( + vector<string> const& _namespacedName, NameAndTypeResolver const& _resolver) { Declaration const* declaration = nullptr; // bracers are required, cause msvc couldnt handle this macro in for statement @@ -112,13 +112,13 @@ bytes compileFirstExpression(const string& _sourceCode, vector<vector<string>> _ for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes()) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) { - BOOST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract)); + ETH_TEST_REQUIRE_NO_THROW(resolver.resolveNamesAndTypes(*contract), "Resolving names failed"); inheritanceHierarchy = vector<ContractDefinition const*>(1, contract); } for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes()) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) { - BOOST_REQUIRE_NO_THROW(resolver.checkTypeRequirements(*contract)); + ETH_TEST_REQUIRE_NO_THROW(resolver.checkTypeRequirements(*contract), "Checking type Requirements failed"); } for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes()) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) |