From fff17561b9499b10da58d60e7fa9638aa8de3cdb Mon Sep 17 00:00:00 2001 From: David Mandelin Date: Mon, 26 Jul 2010 11:54:12 -0700 Subject: [PATCH] [JAEGER] Fixed a few warnings --- js/src/jsscript.h | 2 +- js/src/methodjit/MethodJIT.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/jsscript.h b/js/src/jsscript.h index 647e605b177..cabd06d8c68 100644 --- a/js/src/jsscript.h +++ b/js/src/jsscript.h @@ -102,7 +102,7 @@ class UpvarCookie uint32 asInteger() const { return value; } /* isFree check should be performed before using these accessors. */ uint16 level() const { JS_ASSERT(!isFree()); return value >> 16; } - uint16 slot() const { JS_ASSERT(!isFree()); return value; } + uint16 slot() const { JS_ASSERT(!isFree()); return uint16(value); } void set(const UpvarCookie &other) { set(other.level(), other.slot()); } void set(uint16 newLevel, uint16 newSlot) { value = (uint32(newLevel) << 16) | newSlot; } diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h index b3f7efd5a33..587b65069c6 100644 --- a/js/src/methodjit/MethodJIT.h +++ b/js/src/methodjit/MethodJIT.h @@ -64,7 +64,7 @@ struct VMFrame /* This must be the first entry on CPUs which push return addresses. */ void *scriptedReturn; -#if defined(JS_CPU_X86) or defined(JS_CPU_X64) +#if defined(JS_CPU_X86) || defined(JS_CPU_X64) uintptr_t padding; #endif