Merge pull request #6125 from ethereum/windows-fix-again

Fix ambiguous type on Windows
This commit is contained in:
chriseth 2019-02-27 10:54:19 +01:00 committed by GitHub
commit 5345afaa34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -111,7 +111,7 @@ string TestFunctionCall::format(string const& _linePrefix, bool const _renderRes
return _stream.str();
}
string TestFunctionCall::formatBytesParameters(bytes const& _bytes, ParameterList const& _params) const
string TestFunctionCall::formatBytesParameters(bytes const& _bytes, dev::solidity::test::ParameterList const& _params) const
{
stringstream resultStream;
if (_bytes.empty())
@ -174,7 +174,7 @@ string TestFunctionCall::formatBytesParameters(bytes const& _bytes, ParameterLis
return resultStream.str();
}
string TestFunctionCall::formatRawParameters(ParameterList const& _params, std::string const& _linePrefix) const
string TestFunctionCall::formatRawParameters(dev::solidity::test::ParameterList const& _params, std::string const& _linePrefix) const
{
stringstream resultStream;
for (auto const& param: _params)