Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1

contracts/introspection/ERC165.sol

@@ -1,55 +1,44 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.0;
 
 import "zos-lib/contracts/Initializable.sol";
 import "./IERC165.sol";
 
-
 /**
  * @title ERC165
  * @author Matt Condon (@shrugs)
  * @dev Implements ERC165 using a lookup table.
  */
 contract ERC165 is Initializable, IERC165 {
-
-    bytes4 private constant _InterfaceId_ERC165 = 0x01ffc9a7;
+    bytes4 private constant _INTERFACE_ID_ERC165 = 0x01ffc9a7;
     /**
      * 0x01ffc9a7 ===
-     *   bytes4(keccak256('supportsInterface(bytes4)'))
+     *     bytes4(keccak256('supportsInterface(bytes4)'))
      */
 
     /**
      * @dev a mapping of interface id to whether or not it's supported
      */
-    mapping(bytes4 => bool) internal _supportedInterfaces;
+    mapping(bytes4 => bool) private _supportedInterfaces;
 
     /**
      * @dev A contract implementing SupportsInterfaceWithLookup
      * implement ERC165 itself
      */
-    function initialize()
-        public
-        initializer
-    {
+    function initialize() public initializer {
         _registerInterface(_InterfaceId_ERC165);
     }
 
     /**
      * @dev implement supportsInterface(bytes4) using a lookup table
      */
-    function supportsInterface(bytes4 interfaceId)
-        public
-        view
-        returns (bool)
-    {
+    function supportsInterface(bytes4 interfaceId) external view returns (bool) {
         return _supportedInterfaces[interfaceId];
     }
 
     /**
-     * @dev private method for registering an interface
+     * @dev internal method for registering an interface
      */
-    function _registerInterface(bytes4 interfaceId)
-        internal
-    {
+    function _registerInterface(bytes4 interfaceId) internal {
         require(interfaceId != 0xffffffff);
         _supportedInterfaces[interfaceId] = true;
     }