Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows warning patrol. rs=luke

Browse Source 
--HG--
extra : rebase_source : 1b6800ae7a7d56c1d8f056d6d06d0c9d45815e42
This commit is contained in:
Jeff Walden 2011-08-04 14:28:41 -07:00
parent f288cf29c0
commit 6dacf09c85
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsemit.cpp
View File

@ -5233,10 +5233,10 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
if (!EmitAssignment(cx, cg, pn2->pn_kid2, JSOP_NOP, NULL))
return false;
tmp2 = CG_OFFSET(cg);
if (pn2->pn_kid1 && !js_NewSrcNote2(cx, cg, SRC_DECL,
(pn2->pn_kid1->pn_op == JSOP_DEFVAR)
? SRC_DECL_VAR
: SRC_DECL_LET) < 0) {
if (pn2->pn_kid1 && js_NewSrcNote2(cx, cg, SRC_DECL,
(pn2->pn_kid1->pn_op == JSOP_DEFVAR)
? SRC_DECL_VAR
: SRC_DECL_LET) < 0) {
return false;
}
if (js_Emit1(cx, cg, JSOP_POP) < 0)

6
js/src/jshashtable.h
View File

@ -757,7 +757,9 @@ class TaggedPointerEntry
public:
TaggedPointerEntry() : bits(0) {}
TaggedPointerEntry(const TaggedPointerEntry &other) : bits(other.bits) {}
TaggedPointerEntry(T *ptr, bool tagged) : bits(uintptr_t(ptr) | tagged) {
TaggedPointerEntry(T *ptr, bool tagged)
: bits(uintptr_t(ptr) | uintptr_t(tagged))
{
JS_ASSERT((uintptr_t(ptr) & 0x1) == 0);
}
@ -770,7 +772,7 @@ class TaggedPointerEntry
* the hash function doesn't consider the tag to be a portion of the key.
*/
void setTagged(bool enabled) const {
const_cast<ThisT *>(this)->bits |= enabled;
const_cast<ThisT *>(this)->bits |= uintptr_t(enabled);
}
T *asPtr() const {

10
js/src/shell/jsoptparse.h
View File

@ -49,11 +49,11 @@ namespace cli {
namespace detail {
class BoolOption;
class MultiStringOption;
class ValuedOption;
class StringOption;
class IntOption;
struct BoolOption;
struct MultiStringOption;
struct ValuedOption;
struct StringOption;
struct IntOption;
enum OptionKind
{

2
js/src/vm/ArgumentsObject.h
View File

@ -182,7 +182,7 @@ class ArgumentsObject : public ::JSObject
#endif
#ifdef JS_POLYIC
friend class ::GetPropCompiler;
friend class mjit::ic::GetElementIC;
friend struct mjit::ic::GetElementIC;
#endif
void setInitialLength(uint32 length);