Skip to content

Commit

Permalink
src: elevate namespaces of repeated artifacts
Browse files Browse the repository at this point in the history
PR-URL: nodejs#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>
  • Loading branch information
Maya Anilson authored and Trott committed Nov 20, 2018
1 parent 67c0921 commit 77c2cf9
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/node_i18n.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -257,7 +258,7 @@ class ConverterObject : public BaseObject, Converter {

protected:
ConverterObject(Environment* env,
v8::Local<v8::Object> wrap,
Local<Object> wrap,
UConverter* converter,
bool ignoreBOM,
const char* sub = nullptr) :
Expand Down Expand Up @@ -506,7 +507,7 @@ void ICUErrorName(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(),
u_errorName(status),
v8::NewStringType::kNormal).ToLocalChecked());
NewStringType::kNormal).ToLocalChecked());
}

#define TYPE_ICU "icu"
Expand Down Expand Up @@ -552,7 +553,7 @@ void GetVersion(const FunctionCallbackInfo<Value>& 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());
Expand All @@ -565,7 +566,7 @@ void GetVersion(const FunctionCallbackInfo<Value>& args) {
// Success.
args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(),
versionString, v8::NewStringType::kNormal).ToLocalChecked());
versionString, NewStringType::kNormal).ToLocalChecked());
}
}
}
Expand Down Expand Up @@ -722,7 +723,7 @@ static void ToUnicode(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(),
*buf,
v8::NewStringType::kNormal,
NewStringType::kNormal,
len).ToLocalChecked());
}

Expand All @@ -745,7 +746,7 @@ static void ToASCII(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(
String::NewFromUtf8(env->isolate(),
*buf,
v8::NewStringType::kNormal,
NewStringType::kNormal,
len).ToLocalChecked());
}

Expand Down

2 comments on commit 77c2cf9

@manilson
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Trott , looks like my user.email for this commit is wrong, the correct email id is mayaanilson@yahoo.in , if it is manilson@yahoo.in can you change it to mayaanilson@yahoo.in. In my fist commit I entered an incorrect email id which I later corrected. However, that change probably didnt get updated with the old commit.

@Trott
Copy link
Owner

@Trott Trott commented on 77c2cf9 Nov 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry, I don't believe it can be changed retroactively without doing something very disruptive like a force push.

Please sign in to comment.