Merge remote-tracking branch 'origin/develop' into develop_060

This commit is contained in:
chriseth committed 2019-10-28 15:21:49 +01:00
commit edf1e83fda
67 files changed
+182 -165

No files matched your search

+1 -1
View File
@@ -884,7 +884,7 @@ bool CommandLineInterface::processInput()
if (m_args.count(g_strEVMVersion))
{
string versionOptionStr = m_args[g_strEVMVersion].as<string>();
boost::optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
std::optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
if (!versionOption)
{
serr() << "Invalid option for --evm-version: " << versionOptionStr << endl;