Skip to content

Commit

Permalink
src: use v8:: for consistency in util
Browse files Browse the repository at this point in the history
PR-URL: #23934
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
  • Loading branch information
ZYSzys authored and targos committed Nov 2, 2018
1 parent 7012f72 commit 38b0525
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
20 changes: 13 additions & 7 deletions src/node_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,25 @@ namespace util {

using v8::ALL_PROPERTIES;
using v8::Array;
using v8::Boolean;
using v8::Context;
using v8::Function;
using v8::FunctionCallbackInfo;
using v8::IndexFilter;
using v8::Integer;
using v8::Isolate;
using v8::KeyCollectionMode;
using v8::Local;
using v8::NewStringType;
using v8::Object;
using v8::ONLY_CONFIGURABLE;
using v8::ONLY_ENUMERABLE;
using v8::ONLY_WRITABLE;
using v8::Private;
using v8::Promise;
using v8::PropertyFilter;
using v8::Proxy;
using v8::ReadOnly;
using v8::SKIP_STRINGS;
using v8::SKIP_SYMBOLS;
using v8::String;
Expand All @@ -37,13 +43,13 @@ static void GetOwnNonIndexProperties(

Local<Array> properties;

v8::PropertyFilter filter =
static_cast<v8::PropertyFilter>(args[1].As<Uint32>()->Value());
PropertyFilter filter =
static_cast<PropertyFilter>(args[1].As<Uint32>()->Value());

if (!object->GetPropertyNames(
context, v8::KeyCollectionMode::kOwnOnly,
context, KeyCollectionMode::kOwnOnly,
filter,
v8::IndexFilter::kSkipIndices)
IndexFilter::kSkipIndices)
.ToLocal(&properties)) {
return;
}
Expand Down Expand Up @@ -96,7 +102,7 @@ static void PreviewEntries(const FunctionCallbackInfo<Value>& args) {
return args.GetReturnValue().Set(entries);
Local<Array> ret = Array::New(env->isolate(), 2);
ret->Set(env->context(), 0, entries).FromJust();
ret->Set(env->context(), 1, v8::Boolean::New(env->isolate(), is_key_value))
ret->Set(env->context(), 1, Boolean::New(env->isolate(), is_key_value))
.FromJust();
return args.GetReturnValue().Set(ret);
}
Expand Down Expand Up @@ -171,7 +177,7 @@ void SafeGetenv(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue()
.Set(String::NewFromUtf8(
args.GetIsolate(), text.c_str(),
v8::NewStringType::kNormal).ToLocalChecked());
NewStringType::kNormal).ToLocalChecked());
}

void EnqueueMicrotask(const FunctionCallbackInfo<Value>& args) {
Expand Down Expand Up @@ -202,7 +208,7 @@ void Initialize(Local<Object> target,
env->context(),
OneByteString(env->isolate(), "pushValToArrayMax"),
Integer::NewFromUnsigned(env->isolate(), NODE_PUSH_VAL_TO_ARRAY_MAX),
v8::ReadOnly).FromJust();
ReadOnly).FromJust();

#define V(name) \
target->Set(context, \
Expand Down
4 changes: 2 additions & 2 deletions src/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ BufferValue::BufferValue(Isolate* isolate, Local<Value> value) {

void LowMemoryNotification() {
if (v8_initialized) {
auto isolate = v8::Isolate::GetCurrent();
auto isolate = Isolate::GetCurrent();
if (isolate != nullptr) {
isolate->LowMemoryNotification();
}
Expand Down Expand Up @@ -134,7 +134,7 @@ std::set<std::string> ParseCommaSeparatedSet(const std::string& in) {
return out;
}

void ThrowErrStringTooLong(v8::Isolate* isolate) {
void ThrowErrStringTooLong(Isolate* isolate) {
isolate->ThrowException(ERR_STRING_TOO_LONG(isolate));
}

Expand Down

0 comments on commit 38b0525

Please sign in to comment.