From kde-commits Sat Sep 04 23:19:10 2010 From: =?utf-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 04 Sep 2010 23:19:10 +0000 To: kde-commits Subject: KDE/kdelibs/kjs Message-Id: <20100904231910.93B38AC884 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128364210330926 SVN commit 1171735 by stikonas: Silence some compiler warnings. M +13 -13 dtoa.cpp --- trunk/KDE/kdelibs/kjs/dtoa.cpp #1171734:1171735 @@ -1094,16 +1094,16 @@ *e = 32 - k; #ifdef Pack_32 if (k < Ebits) { - d0 = Exp_1 | y >> Ebits - k; + d0 = Exp_1 | y >> (Ebits - k); w = xa > xa0 ? *--xa : 0; - d1 = y << (32-Ebits) + k | w >> Ebits - k; + d1 = y << (32-Ebits + k) | w >> (Ebits - k); goto ret_d; } z = xa > xa0 ? *--xa : 0; if (k -= Ebits) { - d0 = Exp_1 | y << k | z >> 32 - k; + d0 = Exp_1 | y << k | z >> (32 - k); y = xa > xa0 ? *--xa : 0; - d1 = z << k | y >> 32 - k; + d1 = z << k | y >> (32 - k); } else { d0 = Exp_1 | y; @@ -1180,7 +1180,7 @@ #ifdef Pack_32 if ((y = d1)) { if ((k = lo0bits(&y))) { - x[0] = y | z << 32 - k; + x[0] = y | z << (32 - k); z >>= k; } else @@ -1808,7 +1808,7 @@ if (j >= 53) word0(rv) = (P+2)*Exp_msk1; else - word0(rv) &= 0xffffffff << j-32; + word0(rv) &= 0xffffffff << (j-32); } else word1(rv) &= 0xffffffff << j; @@ -2679,8 +2679,8 @@ /* d is denormalized */ i = bbits + be + (Bias + (P-1) - 1); - x = i > 32 ? word0(d) << 64 - i | word1(d) >> i - 32 - : word1(d) << 32 - i; + x = i > 32 ? word0(d) << (64 - i) | word1(d) >> (i - 32) + : word1(d) << (32 - i); dval(d2) = x; word0(d2) -= 31*Exp_msk1; /* adjust exponent */ i -= (Bias + (P-1) - 1) + 1; @@ -2904,7 +2904,7 @@ } #endif dval(d) += dval(d); - if (dval(d) > ds || dval(d) == ds && L & 1) { + if (dval(d) > ds || (dval(d) == ds && L & 1)) { bump_up: while(*--s == '9') if (s == s0) { @@ -3074,11 +3074,11 @@ goto ret; } #endif - if (j < 0 || j == 0 && mode != 1 + if (j < 0 || (j == 0 && mode != 1 #ifndef ROUND_BIASED && !(word1(d) & 1) #endif - ) { + )) { if (!b->x[0] && b->wds <= 1) { #ifdef SET_INEXACT inexact = 0; @@ -3095,7 +3095,7 @@ if (j1 > 0) { b = lshift(b, 1); j1 = cmp(b, S); - if ((j1 > 0 || j1 == 0 && dig & 1) + if ((j1 > 0 || (j1 == 0 && dig & 1)) && dig++ == '9') goto round_9_up; } @@ -3155,7 +3155,7 @@ #endif b = lshift(b, 1); j = cmp(b, S); - if (j > 0 || j == 0 && dig & 1) { + if (j > 0 || (j == 0 && dig & 1)) { roundoff: while(*--s == '9') if (s == s0) {