From daf1784be4024e3d5490fb3ec361c35d4038dbc8 Mon Sep 17 00:00:00 2001 From: RStorm Date: Wed, 28 Jun 2017 22:15:51 -0700 Subject: [PATCH] change inheritance order for StandardToken and PausableToken --- contracts/token/PausableToken.sol | 2 +- contracts/token/StandardToken.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/token/PausableToken.sol b/contracts/token/PausableToken.sol index 4372a80a8..b2bf79907 100644 --- a/contracts/token/PausableToken.sol +++ b/contracts/token/PausableToken.sol @@ -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); diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol index 67e5d3f13..deb907261 100644 --- a/contracts/token/StandardToken.sol +++ b/contracts/token/StandardToken.sol @@ -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;