Commit 379ca2fc authored by Makoto Kato's avatar Makoto Kato
Browse files

Bug 672450 - C4233/C4267 warning for jsobj.h, vm/String.h and jsatom.h. r=luke

parent 7abc217f

js/src/jsatom.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ struct DefaultHasher<jsid> 
    typedef jsid Lookup;

    static HashNumber hash(const Lookup &l) {

        JS_ASSERT(l == js_CheckForStringIndex(l));

        return JSID_BITS(l);

        return HashNumber(JSID_BITS(l));

    }

    static bool match(const jsid &id, const Lookup &l) {

        JS_ASSERT(l == js_CheckForStringIndex(l));

js/src/jsobj.h

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ struct JSObject : js::gc::Cell { 


    /* gc::FinalizeKind */ unsigned finalizeKind() const;



    uint32 numSlots() const { return capacity; }

    uint32 numSlots() const { return uint32(capacity); }



    size_t slotsAndStructSize(uint32 nslots) const;

    size_t slotsAndStructSize() const { return slotsAndStructSize(numSlots()); }

js/src/vm/String.h

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ class JSExternalString : public JSFixedString 
    intN externalType() const {

        JS_ASSERT(isExternal());

        JS_ASSERT(d.s.u2.externalType < TYPE_LIMIT);

        return d.s.u2.externalType;

        return intN(d.s.u2.externalType);

    }



    void *externalClosure() const {