Browse Source

Merge pull request #280 from rstormsf/fix/revert_inheritance_order

change inheritance order for StandardToken and PausableToken
Manuel Aráoz 8 years ago
parent
commit
3430c7a289
2 changed files with 2 additions and 2 deletions
  1. 1 1
      contracts/token/PausableToken.sol
  2. 1 1
      contracts/token/StandardToken.sol

+ 1 - 1
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);

+ 1 - 1
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;