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
3430c7a2
Commit
3430c7a2
authored
Jun 29, 2017
by
Manuel Aráoz
Committed by
GitHub
Jun 29, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #280 from rstormsf/fix/revert_inheritance_order
change inheritance order for StandardToken and PausableToken
parents
82ca3857
daf1784b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
PausableToken.sol
contracts/token/PausableToken.sol
+1
-1
StandardToken.sol
contracts/token/StandardToken.sol
+1
-1
No files found.
contracts/token/PausableToken.sol
View file @
3430c7a2
...
@@ -13,7 +13,7 @@ import '../lifecycle/Pausable.sol';
...
@@ -13,7 +13,7 @@ import '../lifecycle/Pausable.sol';
* https://github.com/BCAPtoken/BCAPToken/blob/5cb5e76338cc47343ba9268663a915337c8b268e/sol/BCAPToken.sol#L27
* 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 {
function transfer(address _to, uint256 _value) whenNotPaused {
super.transfer(_to, _value);
super.transfer(_to, _value);
...
...
contracts/token/StandardToken.sol
View file @
3430c7a2
...
@@ -12,7 +12,7 @@ import './ERC20.sol';
...
@@ -12,7 +12,7 @@ import './ERC20.sol';
* @dev https://github.com/ethereum/EIPs/issues/20
* @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
* @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;
mapping (address => mapping (address => uint256)) allowed;
...
...
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