From 4cd7be8c82b36c1d6792dd8b1634632c5d8881a2 Mon Sep 17 00:00:00 2001 From: Maya Anilson Date: Sat, 17 Nov 2018 17:59:15 +0530 Subject: [PATCH] src: elevate namespaces of repeated artifacts --- src/node_i18n.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/node_i18n.cc b/src/node_i18n.cc index fda53cc6d4a5d6..d2a8c381820fa2 100644 --- a/src/node_i18n.cc +++ b/src/node_i18n.cc @@ -91,6 +91,7 @@ using v8::Int32; using v8::Isolate; using v8::Local; using v8::MaybeLocal; +using v8::NewStringType; using v8::Object; using v8::ObjectTemplate; using v8::String; @@ -257,7 +258,7 @@ class ConverterObject : public BaseObject, Converter { protected: ConverterObject(Environment* env, - v8::Local wrap, + Local wrap, UConverter* converter, bool ignoreBOM, const char* sub = nullptr) : @@ -506,7 +507,7 @@ void ICUErrorName(const FunctionCallbackInfo& args) { args.GetReturnValue().Set( String::NewFromUtf8(env->isolate(), u_errorName(status), - v8::NewStringType::kNormal).ToLocalChecked()); + NewStringType::kNormal).ToLocalChecked()); } #define TYPE_ICU "icu" @@ -552,7 +553,7 @@ void GetVersion(const FunctionCallbackInfo& args) { TYPE_ICU "," TYPE_UNICODE "," TYPE_CLDR "," - TYPE_TZ, v8::NewStringType::kNormal).ToLocalChecked()); + TYPE_TZ, NewStringType::kNormal).ToLocalChecked()); } else { CHECK_GE(args.Length(), 1); CHECK(args[0]->IsString()); @@ -565,7 +566,7 @@ void GetVersion(const FunctionCallbackInfo& args) { // Success. args.GetReturnValue().Set( String::NewFromUtf8(env->isolate(), - versionString, v8::NewStringType::kNormal).ToLocalChecked()); + versionString, NewStringType::kNormal).ToLocalChecked()); } } } @@ -722,7 +723,7 @@ static void ToUnicode(const FunctionCallbackInfo& args) { args.GetReturnValue().Set( String::NewFromUtf8(env->isolate(), *buf, - v8::NewStringType::kNormal, + NewStringType::kNormal, len).ToLocalChecked()); } @@ -745,7 +746,7 @@ static void ToASCII(const FunctionCallbackInfo& args) { args.GetReturnValue().Set( String::NewFromUtf8(env->isolate(), *buf, - v8::NewStringType::kNormal, + NewStringType::kNormal, len).ToLocalChecked()); }