Bug 421947 - "More C++ casts required for Windows only, especially overloaded pow() and log10()" [p=benjamin@smedbergs.us (Benjamin Smedberg [bsmedberg]) r=crowder a1.9=damons]

This commit is contained in:
reed@reedloden.com 2008-03-11 01:09:41 -07:00
parent fc7cc13805
commit c2231a43b1
2 changed files with 4 additions and 4 deletions

View File

@ -6837,7 +6837,7 @@ interrupt:
* op may be invalid here when a catch or finally handler jumps to
* advance_pc.
*/
op = pc[-len];
op = (JSOp) pc[-len];
ndefs = js_CodeSpec[op].ndefs;
if (ndefs) {
SAVE_SP_AND_PC(fp);

View File

@ -89,7 +89,7 @@ BinToVal(uintN logscale, uintN bin)
if (logscale == 2)
return JS_BIT(bin);
JS_ASSERT(logscale == 10);
return (uint32) pow(10, bin);
return (uint32) pow(10, (double) bin);
}
static uintN
@ -100,7 +100,7 @@ ValToBin(uintN logscale, uint32 val)
if (val <= 1)
return val;
bin = (logscale == 10)
? (uintN) ceil(log10(val))
? (uintN) ceil(log10((double) val))
: (logscale == 2)
? (uintN) JS_CeilingLog2(val)
: val;
@ -198,7 +198,7 @@ JS_DumpHistogram(JSBasicStats *bs, FILE *fp)
fprintf(fp, "%s %8u ", (bin == 10) ? "+" : ":", cnt);
if (cnt != 0) {
if (max > 1e6 && mean > 1e3)
cnt = (uint32) ceil(log10(cnt));
cnt = (uint32) ceil(log10((double) cnt));
else if (max > 16 && mean > 8)
cnt = JS_CeilingLog2(cnt);
for (i = 0; i < cnt; i++)