summaryrefslogtreecommitdiff
path: root/src/node_util.cc
diff options
context:
space:
mode:
authorEvan Lucas <evanlucas@me.com>2015-10-05 20:44:09 -0500
committerEvan Lucas <evanlucas@me.com>2015-10-06 16:19:55 -0500
commita1bda1b4deb08dfb3e06cb778f0db40023b18318 (patch)
treea5d7a4919ef970198455357bed31ab1da1311b7e /src/node_util.cc
parent87d26152b4a0869deac5d23813ac8b0ee697ec5f (diff)
downloadandroid-node-v8-a1bda1b4deb08dfb3e06cb778f0db40023b18318.tar.gz
android-node-v8-a1bda1b4deb08dfb3e06cb778f0db40023b18318.tar.bz2
android-node-v8-a1bda1b4deb08dfb3e06cb778f0db40023b18318.zip
util: fix for inspecting promises
The upgrade to v8 4.6 removes ObjectIsPromise. This change utilizes v8::Value::IsPromise to verify that the argument is indeed a promise. PR-URL: https://github.com/nodejs/node/pull/3221 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src/node_util.cc')
-rw-r--r--src/node_util.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/node_util.cc b/src/node_util.cc
index cc86478e09..19c3e3240a 100644
--- a/src/node_util.cc
+++ b/src/node_util.cc
@@ -23,6 +23,10 @@ static void IsSetIterator(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(args[0]->IsSetIterator());
}
+static void IsPromise(const FunctionCallbackInfo<Value>& args) {
+ CHECK_EQ(1, args.Length());
+ args.GetReturnValue().Set(args[0]->IsPromise());
+}
void Initialize(Local<Object> target,
Local<Value> unused,
@@ -30,6 +34,7 @@ void Initialize(Local<Object> target,
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "isMapIterator", IsMapIterator);
env->SetMethod(target, "isSetIterator", IsSetIterator);
+ env->SetMethod(target, "isPromise", IsPromise);
}
} // namespace util