Bug 1164602 - Replace js::NullPtr and JS::NullPtr with nullptr_t; r=sfink

2015-05-13 14:07:34 -07:00
parent c350c5f526
commit 3ffd505617
106 changed files with 304 additions and 346 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -457,7 +457,7 @@ GetCustomIterator(JSContext* cx, HandleObject obj, unsigned flags, MutableHandle
            return false;
        RootedValue val(cx, ObjectValue(*obj));
        ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
-                          -1, val, js::NullPtr(), bytes.ptr());
+                          -1, val, nullptr, bytes.ptr());
        return false;
    }
    objp.set(&rval.toObject());