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
c3cb0dcf
Commit
c3cb0dcf
authored
Jun 06, 2017
by
Manuel Aráoz
Committed by
GitHub
Jun 06, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #238 from DaveAppleton/master
remove redundant return
parents
2eded7a3
f214dcca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
LimitedTransferToken.sol
contracts/token/LimitedTransferToken.sol
+2
-2
PausableToken.sol
contracts/token/PausableToken.sol
+3
-4
No files found.
contracts/token/LimitedTransferToken.sol
View file @
c3cb0dcf
...
@@ -33,7 +33,7 @@ contract LimitedTransferToken is ERC20 {
...
@@ -33,7 +33,7 @@ contract LimitedTransferToken is ERC20 {
* @param _value The amount of tokens to be transferred.
* @param _value The amount of tokens to be transferred.
*/
*/
function transfer(address _to, uint _value) canTransfer(msg.sender, _value) {
function transfer(address _to, uint _value) canTransfer(msg.sender, _value) {
return
super.transfer(_to, _value);
super.transfer(_to, _value);
}
}
/**
/**
...
@@ -43,7 +43,7 @@ contract LimitedTransferToken is ERC20 {
...
@@ -43,7 +43,7 @@ contract LimitedTransferToken is ERC20 {
* @param _value The amount of tokens to be transferred.
* @param _value The amount of tokens to be transferred.
*/
*/
function transferFrom(address _from, address _to, uint _value) canTransfer(_from, _value) {
function transferFrom(address _from, address _to, uint _value) canTransfer(_from, _value) {
return
super.transferFrom(_from, _to, _value);
super.transferFrom(_from, _to, _value);
}
}
/**
/**
...
...
contracts/token/PausableToken.sol
View file @
c3cb0dcf
...
@@ -16,10 +16,10 @@ import '../lifecycle/Pausable.sol';
...
@@ -16,10 +16,10 @@ import '../lifecycle/Pausable.sol';
contract PausableToken is Pausable, StandardToken {
contract PausableToken is Pausable, StandardToken {
function transfer(address _to, uint _value) whenNotPaused {
function transfer(address _to, uint _value) whenNotPaused {
return
super.transfer(_to, _value);
super.transfer(_to, _value);
}
}
function transferFrom(address _from, address _to, uint _value) whenNotPaused {
function transferFrom(address _from, address _to, uint _value) whenNotPaused {
return
super.transferFrom(_from, _to, _value);
super.transferFrom(_from, _to, _value);
}
}
}
}
\ No newline at end of file
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