Merge branch 'v2-prototype' into abi-gen-ignore-unchanged

1 files changed, 8 insertions, 9 deletions

diff --git a/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol b/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
index ec0a3fe76..4413244db 100644
--- a/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
+++ b/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
@@ -1,28 +1,27 @@
-pragma solidity ^0.4.24;
-pragma experimental ABIEncoderV2;
+pragma solidity 0.4.24;
 
 
 contract SafeMath {
-    function safeMul(uint a, uint b)
+    function safeMul(uint256 a, uint256 b)
         internal
         pure
         returns (uint256)
     {
-        uint c = a * b;
+        uint256 c = a * b;
         assert(a == 0 || c / a == b);
         return c;
     }
 
-    function safeDiv(uint a, uint b)
+    function safeDiv(uint256 a, uint256 b)
         internal
         pure
         returns (uint256)
     {
-        uint c = a / b;
+        uint256 c = a / b;
         return c;
     }
 
-    function safeSub(uint a, uint b)
+    function safeSub(uint256 a, uint256 b)
         internal
         pure
         returns (uint256)
@@ -31,12 +30,12 @@ contract SafeMath {
         return a - b;
     }
 
-    function safeAdd(uint a, uint b)
+    function safeAdd(uint256 a, uint256 b)
         internal
         pure
         returns (uint256)
     {
-        uint c = a + b;
+        uint256 c = a + b;
         assert(c >= a);
         return c;
     }