Add log2, log10 and log256 functions (OpenZeppelin#3670)

JulissaDantes · Nov 4, 2022 · 9074c62 · 9074c62
1 parent b57beee
commit 9074c62
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/contracts/utils/math/Math.sol b/contracts/utils/math/Math.sol
@@ -339,7 +339,11 @@ library Math {
     function log256(uint256 value, Rounding rounding) internal pure returns (uint256) {
         unchecked {
             uint256 result = log256(value);
+<<<<<<< HEAD
             return result + (rounding == Rounding.Up && 1 << (result << 3) < value ? 1 : 0);
+=======
+            return result + (rounding == Rounding.Up && 1 << (result * 8) < value ? 1 : 0);
+>>>>>>> 8bdaadd1 (Add log2, log10 and log256 functions (#3670))
         }
     }
 }