Merge branch 'master' into fix/solc-0.8-#2441

OpenZeppelin · Dec 18, 2020 · b72352c · b72352c
2 parents c6e9524 + 6be0b41
commit b72352c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contracts/token/ERC1155/ERC1155Receiver.sol b/contracts/token/ERC1155/ERC1155Receiver.sol
@@ -11,8 +11,8 @@ import "../../introspection/ERC165.sol";
 abstract contract ERC1155Receiver is ERC165, IERC1155Receiver {
     constructor() internal {
         _registerInterface(
-            ERC1155Receiver(address(uint160(0))).onERC1155Received.selector ^
-            ERC1155Receiver(address(uint160(0))).onERC1155BatchReceived.selector
+            ERC1155Receiver(address(0)).onERC1155Received.selector ^
+            ERC1155Receiver(address(0)).onERC1155BatchReceived.selector
         );
     }
 }