diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-07 18:38:38 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-07 22:11:18 +0100 |
commit | dad73f645cde6920e79db956e7ef82ed640d7615 (patch) | |
tree | 7ba3f3fc7e0722c5f130065461b7c56f571af383 /deps/v8/src/elements.h | |
parent | 53ba494537259b18b346dc6150d6a100c557e08f (diff) | |
download | android-node-v8-dad73f645cde6920e79db956e7ef82ed640d7615.tar.gz android-node-v8-dad73f645cde6920e79db956e7ef82ed640d7615.tar.bz2 android-node-v8-dad73f645cde6920e79db956e7ef82ed640d7615.zip |
deps: upgrade v8 to 3.31.74.1
PR-URL: https://github.com/iojs/io.js/pull/243
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/v8/src/elements.h')
-rw-r--r-- | deps/v8/src/elements.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/deps/v8/src/elements.h b/deps/v8/src/elements.h index f4de4bb010..05354eaccf 100644 --- a/deps/v8/src/elements.h +++ b/deps/v8/src/elements.h @@ -167,22 +167,19 @@ class ElementsAccessor { } MUST_USE_RESULT virtual MaybeHandle<FixedArray> AddElementsToFixedArray( - Handle<Object> receiver, - Handle<JSObject> holder, - Handle<FixedArray> to, - Handle<FixedArrayBase> from) = 0; + Handle<Object> receiver, Handle<JSObject> holder, Handle<FixedArray> to, + Handle<FixedArrayBase> from, FixedArray::KeyFilter filter) = 0; MUST_USE_RESULT inline MaybeHandle<FixedArray> AddElementsToFixedArray( - Handle<Object> receiver, - Handle<JSObject> holder, - Handle<FixedArray> to) { - return AddElementsToFixedArray( - receiver, holder, to, handle(holder->elements())); + Handle<Object> receiver, Handle<JSObject> holder, Handle<FixedArray> to, + FixedArray::KeyFilter filter) { + return AddElementsToFixedArray(receiver, holder, to, + handle(holder->elements()), filter); } // Returns a shared ElementsAccessor for the specified ElementsKind. static ElementsAccessor* ForKind(ElementsKind elements_kind) { - DCHECK(elements_kind < kElementsKindCount); + DCHECK(static_cast<int>(elements_kind) < kElementsKindCount); return elements_accessors_[elements_kind]; } |