Commit e98edd16 authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] avoid fixed-dtoa.cc conflicts with base/macros.h's RoundUp

Bug: chromium:746958
Change-Id: I18593669e8a8bb622b575258441d4933ad98ec3e
Reviewed-on: https://chromium-review.googlesource.com/654871Reviewed-by: 's avatarClemens Hammacher <clemensh@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@opera.com>
Cr-Commit-Position: refs/heads/master@{#47894}
parent da6aab43
......@@ -168,8 +168,7 @@ static void FillDigits64(uint64_t number, Vector<char> buffer, int* length) {
}
}
static void RoundUp(Vector<char> buffer, int* length, int* decimal_point) {
static void DtoaRoundUp(Vector<char> buffer, int* length, int* decimal_point) {
// An empty buffer represents 0.
if (*length == 0) {
buffer[0] = '1';
......@@ -242,7 +241,7 @@ static void FillFractionals(uint64_t fractionals, int exponent,
}
// If the first bit after the point is set we have to round up.
if (((fractionals >> (point - 1)) & 1) == 1) {
RoundUp(buffer, length, decimal_point);
DtoaRoundUp(buffer, length, decimal_point);
}
} else { // We need 128 bits.
DCHECK(64 < -exponent && -exponent <= 128);
......@@ -261,7 +260,7 @@ static void FillFractionals(uint64_t fractionals, int exponent,
(*length)++;
}
if (fractionals128.BitAt(point - 1) == 1) {
RoundUp(buffer, length, decimal_point);
DtoaRoundUp(buffer, length, decimal_point);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment