NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change inheritance order for StandardToken and PausableToken

Browse Source
This commit is contained in:
RStorm
2017-06-28 22:15:51 -07:00
parent 82ca385725
commit daf1784be4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/token/PausableToken.sol
View File

@ -13,7 +13,7 @@ import '../lifecycle/Pausable.sol';
* https://github.com/BCAPtoken/BCAPToken/blob/5cb5e76338cc47343ba9268663a915337c8b268e/sol/BCAPToken.sol#L27 * https://github.com/BCAPtoken/BCAPToken/blob/5cb5e76338cc47343ba9268663a915337c8b268e/sol/BCAPToken.sol#L27
**/ **/
contract PausableToken is Pausable, StandardToken { contract PausableToken is StandardToken, Pausable {
function transfer(address _to, uint256 _value) whenNotPaused { function transfer(address _to, uint256 _value) whenNotPaused {
super.transfer(_to, _value); super.transfer(_to, _value);

2
contracts/token/StandardToken.sol
View File

@ -12,7 +12,7 @@ import './ERC20.sol';
* @dev https://github.com/ethereum/EIPs/issues/20 * @dev https://github.com/ethereum/EIPs/issues/20
* @dev Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol * @dev Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
*/ */
contract StandardToken is BasicToken, ERC20 { contract StandardToken is ERC20, BasicToken {
mapping (address => mapping (address => uint256)) allowed; mapping (address => mapping (address => uint256)) allowed;