diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-20 06:34:32 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-20 06:34:32 -0400 |
| commit | 19a7c429a1eea7b80cefb4b72138fafecc9b924a (patch) | |
| tree | c53b630c560ac2dccd2b85dba7895bb8d9d29aa7 /src/components/script/dom/bindings/utils.rs | |
| parent | 371bea7d3b5c200243865153a0dad5acc4ff78ff (diff) | |
| parent | 34b73837d3f5709d4a47b5119afe17f24cfb930c (diff) | |
| download | servo-19a7c429a1eea7b80cefb4b72138fafecc9b924a.tar.gz servo-19a7c429a1eea7b80cefb4b72138fafecc9b924a.zip | |
auto merge of #1944 : lpy/servo/issue1938, r=Ms2ger
see #1938
Diffstat (limited to 'src/components/script/dom/bindings/utils.rs')
| -rw-r--r-- | src/components/script/dom/bindings/utils.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 04a0ddf5d0a..eab336de15c 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -135,7 +135,7 @@ pub fn unwrap_value<T>(val: *JSVal, proto_id: PrototypeList::id::ID, proto_depth } } -pub unsafe fn squirrel_away_unboxed<T>(x: ~T) -> *T { +pub unsafe fn squirrel_away_unique<T>(x: ~T) -> *T { cast::transmute(x) } @@ -409,7 +409,7 @@ pub extern fn ThrowingConstructor(_cx: *JSContext, _argc: c_uint, _vp: *mut JSVa pub fn initialize_global(global: *JSObject) { let protoArray = ~([0 as *JSObject, ..PrototypeList::id::IDCount as uint]); unsafe { - let box_ = squirrel_away_unboxed(protoArray); + let box_ = squirrel_away_unique(protoArray); JS_SetReservedSlot(global, DOM_PROTOTYPE_SLOT, PrivateValue(box_ as *libc::c_void)); |