aboutsummaryrefslogtreecommitdiff
path: root/deps/v8/src/d8.cc
diff options
context:
space:
mode:
authorMatt Loring <mattloring@google.com>2016-06-06 17:13:05 -0700
committerMichaƫl Zasso <targos@protonmail.com>2016-06-29 10:44:34 +0200
commit9beef23b605a0eaaccf9d0ba680f6c5ada3e8c4f (patch)
tree2ecb1d2bdc65692d3abe7af79481a4b6c5532e8c /deps/v8/src/d8.cc
parentd894648450b3000f758097d91f619c285132ea80 (diff)
downloadandroid-node-v8-9beef23b605a0eaaccf9d0ba680f6c5ada3e8c4f.tar.gz
android-node-v8-9beef23b605a0eaaccf9d0ba680f6c5ada3e8c4f.tar.bz2
android-node-v8-9beef23b605a0eaaccf9d0ba680f6c5ada3e8c4f.zip
deps: bring in V8 5.1 - 5.0 ABI compatibility
Ref: https://github.com/ofrobots/node/pull/23 PR-URL: https://github.com/nodejs/node/pull/7016 Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/d8.cc')
-rw-r--r--deps/v8/src/d8.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/v8/src/d8.cc b/deps/v8/src/d8.cc
index 06883803f9..967d1e4fd4 100644
--- a/deps/v8/src/d8.cc
+++ b/deps/v8/src/d8.cc
@@ -133,7 +133,7 @@ class PredictablePlatform : public Platform {
}
uint64_t AddTraceEvent(char phase, const uint8_t* categoryEnabledFlag,
- const char* name, const char* scope, uint64_t id,
+ const char* name, uint64_t id,
uint64_t bind_id, int numArgs, const char** argNames,
const uint8_t* argTypes, const uint64_t* argValues,
unsigned int flags) override {