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

Merge pull request #280 from rstormsf/fix/revert_inheritance_order

Browse Source 
change inheritance order for StandardToken and PausableToken
This commit is contained in:
Manuel Aráoz
2017-06-29 10:40:43 -03:00
committed by GitHub
parent 82ca385725 daf1784be4
commit 3430c7a289
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
**/
contract PausableToken is Pausable, StandardToken {
contract PausableToken is StandardToken, Pausable {
function transfer(address _to, uint256 _value) whenNotPaused {
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 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;