Merge pull request #15675 from gmh5225/fix-compilation

nikola-matic · web-flow · commit c91c204e0ac8 · 2025-01-09T13:14:50.000+01:00
Fix MSVC compilation error on `EVMVersion` comparison
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
@@ -29,7 +29,7 @@ using namespace solidity::langutil;
 bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersion) const
 {
 	// EOF version can be only defined since prague
-	assert(!_eofVersion.has_value() || this->m_version >= prague());
+	assert(!_eofVersion.has_value() || *this >= prague());
 
 	switch (_opcode)
 	{

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ using namespace solidity::langutil;`
`29`	`29`	`bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersion) const`
`30`	`30`	`{`
`31`	`31`	`// EOF version can be only defined since prague`
`32`		`- assert(!_eofVersion.has_value() \|\| this->m_version >= prague());`
	`32`	`+ assert(!_eofVersion.has_value() \|\| *this >= prague());`
`33`	`33`
`34`	`34`	`switch (_opcode)`
`35`	`35`	`{`