Merge pull request #238 from ekpyron/addressMembers

Cast contracts to address before accessing address members.

Author: chriseth

test/DAO/DAO.sol

@@ -653,7 +653,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
             if (address(p.splitData[0].newDAO) == 0x0000000000000000000000000000000000000000)
                 revert();
             // should never happen
-            if (this.balance < sumOfProposalDeposits)
+            if (address(this).balance < sumOfProposalDeposits)
                 revert();
             p.splitData[0].splitBalance = actualBalance();
             p.splitData[0].rewardToken = rewardToken[address(this)];
@@ -722,7 +722,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
             (rewardToken[msg.sender] * DAOrewardAccount.accumulatedInput()) /
             totalRewardToken - DAOpaidOut[msg.sender];
 
-        reward = DAOrewardAccount.balance < reward ? DAOrewardAccount.balance : reward;
+        reward = address(DAOrewardAccount).balance < reward ? address(DAOrewardAccount).balance : reward;
 
         if(_toMembers) {
             if (!DAOrewardAccount.payOut(dao.rewardAccount(), reward))
@@ -748,7 +748,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
         uint reward =
             (balanceOf(_account) * rewardAccount.accumulatedInput()) / totalSupply - paidOut[_account];
 
-        reward = rewardAccount.balance < reward ? rewardAccount.balance : reward;
+        reward = address(rewardAccount).balance < reward ? address(rewardAccount).balance : reward;
 
         if (!rewardAccount.payOut(_account, reward))
             revert();
@@ -852,7 +852,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
     }
 
     function actualBalance() public view returns (uint _actualBalance) {
-        return this.balance - sumOfProposalDeposits;
+        return address(this).balance - sumOfProposalDeposits;
     }
 
 

test/DAO/TokenCreation.sol

@@ -105,7 +105,7 @@ contract TokenCreation is TokenCreationInterface, Token {
             && (privateCreation == 0x0000000000000000000000000000000000000000 || privateCreation == msg.sender)) {
 
             uint token = (msg.value * 20) / divisor();
-            extraBalance.call.value(msg.value - token)("");
+            address(extraBalance).call.value(msg.value - token)("");
             balances[_tokenHolder] += token;
             totalSupply += token;
             weiGiven[_tokenHolder] += msg.value;
@@ -122,7 +122,7 @@ contract TokenCreation is TokenCreationInterface, Token {
     function refund() noEther public {
         if (now > closingTime && !isFueled) {
             // Get extraBalance - will only succeed when called for the first time
-            if (extraBalance.balance >= extraBalance.accumulatedInput())
+            if (address(extraBalance).balance >= extraBalance.accumulatedInput())
                 extraBalance.payOut(address(this), extraBalance.accumulatedInput());
 
             // Execute refund