Merge branch 'solc-0.7' into solc-0.8

2021-01-27 11:16:05 +01:00
parent 974c534210 fa33fbce75
commit 0db76e98f9
77 changed files with 2301 additions and 1859 deletions
--- a/contracts/introspection/ERC165.sol
+++ b/contracts/introspection/ERC165.sol
@ -32,7 +32,7 @@ abstract contract ERC165 is IERC165 {
     *
     * Time complexity O(1), guaranteed to always use less than 30 000 gas.
     */
-    function supportsInterface(bytes4 interfaceId) public view override returns (bool) {
+    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
        return _supportedInterfaces[interfaceId];
    }