auto merge of #726 : metajack/servo/dlist, r=jdm

r? @jdm
This commit is contained in:
bors-servo 2013-08-21 09:12:41 -07:00
commit d0e47f427e
9 changed files with 65 additions and 3 deletions

View file

@ -624,7 +624,7 @@ pub extern fn ThrowingConstructor(_cx: *JSContext, _argc: uint, _vp: *JSVal) ->
}
pub fn initialize_global(global: *JSObject) {
let protoArray = @mut ([0 as *JSObject, ..52]);
let protoArray = @mut ([0 as *JSObject, ..53]);
assert!(protoArray.len() == PrototypeList::id::_ID_Count as uint);
unsafe {
//XXXjdm we should be storing the box pointer instead of the inner