Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
421ed4f8
Commit
421ed4f8
authored
Jul 02, 2017
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix references to max and min functions
parent
0b1f0804
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
VestedToken.sol
contracts/token/VestedToken.sol
+3
-2
No files found.
contracts/token/VestedToken.sol
View file @
421ed4f8
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 {
...
@@ -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
Safe
Math.min256(vestedTransferable, super.transferableTokens(holder, time));
return Math.min256(vestedTransferable, super.transferableTokens(holder, time));
}
}
/**
/**
...
@@ -241,7 +242,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
...
@@ -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 =
Safe
Math.max64(grants[holder][i].vesting, date);
date = Math.max64(grants[holder][i].vesting, date);
}
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment