1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: elevate namespaces of repeated artifacts

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/24429
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
This commit is contained in:
Maya Anilson 2018-11-17 17:59:15 +05:30 committed by Rich Trott
parent 67c092127e
commit 77c2cf93cc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/node_i18n.cc
View File

@ -91,6 +91,7 @@ using v8::Int32;
using v8::Isolate; using v8::Isolate;
using v8::Local; using v8::Local;
using v8::MaybeLocal; using v8::MaybeLocal;
using v8::NewStringType;
using v8::Object; using v8::Object;
using v8::ObjectTemplate; using v8::ObjectTemplate;
using v8::String; using v8::String;
@ -257,7 +258,7 @@ class ConverterObject : public BaseObject, Converter {
protected: protected:
ConverterObject(Environment* env, ConverterObject(Environment* env,
v8::Local<v8::Object> wrap, Local<Object> wrap,
UConverter* converter, UConverter* converter,
bool ignoreBOM, bool ignoreBOM,
const char* sub = nullptr) : const char* sub = nullptr) :
@ -506,7 +507,7 @@ void ICUErrorName(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set( args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(), String::NewFromUtf8(env->isolate(),
u_errorName(status), u_errorName(status),
v8::NewStringType::kNormal).ToLocalChecked()); NewStringType::kNormal).ToLocalChecked());
} }
#define TYPE_ICU "icu" #define TYPE_ICU "icu"
@ -552,7 +553,7 @@ void GetVersion(const FunctionCallbackInfo<Value>& args) {
TYPE_ICU "," TYPE_ICU ","
TYPE_UNICODE "," TYPE_UNICODE ","
TYPE_CLDR "," TYPE_CLDR ","
TYPE_TZ, v8::NewStringType::kNormal).ToLocalChecked()); TYPE_TZ, NewStringType::kNormal).ToLocalChecked());
} else { } else {
CHECK_GE(args.Length(), 1); CHECK_GE(args.Length(), 1);
CHECK(args[0]->IsString()); CHECK(args[0]->IsString());
@ -565,7 +566,7 @@ void GetVersion(const FunctionCallbackInfo<Value>& args) {
// Success. // Success.
args.GetReturnValue().Set( args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(), String::NewFromUtf8(env->isolate(),
versionString, v8::NewStringType::kNormal).ToLocalChecked()); versionString, NewStringType::kNormal).ToLocalChecked());
} }
} }
} }
@ -722,7 +723,7 @@ static void ToUnicode(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set( args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(), String::NewFromUtf8(env->isolate(),
*buf, *buf,
v8::NewStringType::kNormal, NewStringType::kNormal,
len).ToLocalChecked()); len).ToLocalChecked());
} }
@ -745,7 +746,7 @@ static void ToASCII(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set( args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(), String::NewFromUtf8(env->isolate(),
*buf, *buf,
v8::NewStringType::kNormal, NewStringType::kNormal,
len).ToLocalChecked()); len).ToLocalChecked());
} }