diff options
Diffstat (limited to 'base/third_party')
-rw-r--r-- | base/third_party/dmg_fp/README.chromium | 1 | ||||
-rw-r--r-- | base/third_party/dmg_fp/dtoa.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/base/third_party/dmg_fp/README.chromium b/base/third_party/dmg_fp/README.chromium index 046f273..b857044 100644 --- a/base/third_party/dmg_fp/README.chromium +++ b/base/third_party/dmg_fp/README.chromium @@ -14,3 +14,4 @@ List of changes made to original code: - made some minor changes to allow clean compilation under g++ -Wall, see gcc_warnings.patch. - made some minor changes to build on 64-bit, see gcc_64_bit.patch. + - made some implicit type converisons explicit, see type_conversion.patch. diff --git a/base/third_party/dmg_fp/dtoa.cc b/base/third_party/dmg_fp/dtoa.cc index c1bc476..ffbc088 100644 --- a/base/third_party/dmg_fp/dtoa.cc +++ b/base/third_party/dmg_fp/dtoa.cc @@ -1559,7 +1559,7 @@ hexnan CONST char *s; int c1, havedig, udx0, xshift; - if (!hexdig['0']) + if (!hexdig[static_cast<int>('0')]) hexdig_init(); x[0] = x[1] = 0; havedig = xshift = 0; @@ -3283,7 +3283,7 @@ strtod #ifdef Avoid_Underflow if (bc.scale && y <= 2*P*Exp_msk1) { if (aadj <= 0x7fffffff) { - if ((z = aadj) <= 0) + if ((z = static_cast<ULong>(aadj)) <= 0) z = 1; aadj = z; aadj1 = bc.dsign ? aadj : -aadj; @@ -3837,7 +3837,7 @@ dtoa */ dval(&eps) = 0.5/tens[ilim-1] - dval(&eps); for(i = 0;;) { - L = dval(&u); + L = static_cast<long>(dval(&u)); dval(&u) -= L; *s++ = '0' + (int)L; if (dval(&u) < dval(&eps)) |