Skip to content

Commit af46eb5

Browse files
committed
Add explicit conversions to address.
1 parent 09f8261 commit af46eb5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test/DAO/DAO.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,11 +725,11 @@ contract DAO is DAOInterface, Token, TokenCreation {
725725
reward = address(DAOrewardAccount).balance < reward ? address(DAOrewardAccount).balance : reward;
726726

727727
if(_toMembers) {
728-
if (!DAOrewardAccount.payOut(dao.rewardAccount(), reward))
728+
if (!DAOrewardAccount.payOut(address(dao.rewardAccount()), reward))
729729
revert();
730730
}
731731
else {
732-
if (!DAOrewardAccount.payOut(dao, reward))
732+
if (!DAOrewardAccount.payOut(address(dao), reward))
733733
revert();
734734
}
735735
DAOpaidOut[msg.sender] += reward;
@@ -898,7 +898,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
898898
}
899899

900900
function getNewDAOAddress(uint _proposalID) public view returns (address _newDAO) {
901-
return proposals[_proposalID].splitData[0].newDAO;
901+
return address(proposals[_proposalID].splitData[0].newDAO);
902902
}
903903

904904
function isBlocked(address _account) internal returns (bool) {

test/DAO/Token.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ contract Token is TokenInterface {
142142
public returns (bool success) {
143143
allowed[msg.sender][_spender] = _value;
144144
tokenRecipient spender = tokenRecipient(_spender);
145-
spender.receiveApproval(msg.sender, _value, this, _extraData);
145+
spender.receiveApproval(msg.sender, _value, address(this), _extraData);
146146
return true;
147147
}
148148

0 commit comments

Comments
 (0)