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

fix references to max and min functions

Browse Source
This commit is contained in:
Francisco Giordano
2017-07-02 17:56:34 -03:00
parent 0b1f08043b
commit 421ed4f8ab
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/token/VestedToken.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.11; pragma solidity ^0.4.11;
import "../math/Math.sol";
import "./StandardToken.sol"; import "./StandardToken.sol";
import "./LimitedTransferToken.sol"; import "./LimitedTransferToken.sol";
@ -121,7 +122,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
// Return the minimum of how many vested can transfer and other value // Return the minimum of how many vested can transfer and other value
// in case there are other limiting transferability factors (default is balanceOf) // in case there are other limiting transferability factors (default is balanceOf)
return SafeMath.min256(vestedTransferable, super.transferableTokens(holder, time)); return Math.min256(vestedTransferable, super.transferableTokens(holder, time));
} }
/** /**
@ -241,7 +242,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
date = uint64(now); date = uint64(now);
uint256 grantIndex = grants[holder].length; uint256 grantIndex = grants[holder].length;
for (uint256 i = 0; i < grantIndex; i++) { for (uint256 i = 0; i < grantIndex; i++) {
date = SafeMath.max64(grants[holder][i].vesting, date); date = Math.max64(grants[holder][i].vesting, date);
} }
} }
} }