Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src: remove node namespace qualifiers #18962

Closed
wants to merge 1 commit into from
Closed

src: remove node namespace qualifiers #18962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ using v8::Undefined;
using v8::V8;
using v8::Value;

using AsyncHooks = node::Environment::AsyncHooks;
using AsyncHooks = Environment::AsyncHooks;

static bool print_eval = false;
static bool force_repl = false;
Expand Down Expand Up @@ -273,7 +273,7 @@ static double prog_start_time;
static Mutex node_isolate_mutex;
static v8::Isolate* node_isolate;

node::DebugOptions debug_options;
DebugOptions debug_options;

static struct {
#if NODE_USE_V8_PLATFORM
Expand Down Expand Up @@ -311,7 +311,7 @@ static struct {

#if HAVE_INSPECTOR
bool StartInspector(Environment *env, const char* script_path,
const node::DebugOptions& options) {
const DebugOptions& options) {
// Inspector agent can't fail to start, but if it was configured to listen
// right away on the websocket port and fails to bind/etc, this will return
// false.
Expand Down Expand Up @@ -343,7 +343,7 @@ static struct {
void DrainVMTasks(Isolate* isolate) {}
void CancelVMTasks(Isolate* isolate) {}
bool StartInspector(Environment *env, const char* script_path,
const node::DebugOptions& options) {
const DebugOptions& options) {
env->ThrowError("Node compiled with NODE_USE_V8_PLATFORM=0");
return true;
}
Expand Down Expand Up @@ -780,9 +780,9 @@ Local<Value> WinapiErrnoException(Isolate* isolate,

void* ArrayBufferAllocator::Allocate(size_t size) {
if (zero_fill_field_ || zero_fill_all_buffers)
return node::UncheckedCalloc(size);
return UncheckedCalloc(size);
else
return node::UncheckedMalloc(size);
return UncheckedMalloc(size);
}

namespace {
Expand Down Expand Up @@ -4102,7 +4102,7 @@ void Init(int* argc,
prog_start_time = static_cast<double>(uv_now(uv_default_loop()));

// Register built-in modules
node::RegisterBuiltinModules();
RegisterBuiltinModules();

// Make inherited handles noninheritable.
uv_disable_stdio_inheritance();
Expand Down Expand Up @@ -4454,7 +4454,7 @@ inline int Start(uv_loop_t* event_loop,
int Start(int argc, char** argv) {
atexit([] () { uv_tty_reset_mode(); });
PlatformInit();
node::performance::performance_node_start = PERFORMANCE_NOW();
performance::performance_node_start = PERFORMANCE_NOW();

CHECK_GT(argc, 0);

Expand Down Expand Up @@ -4491,7 +4491,7 @@ int Start(int argc, char** argv) {
v8_platform.StartTracingAgent();
}
V8::Initialize();
node::performance::performance_v8_start = PERFORMANCE_NOW();
performance::performance_v8_start = PERFORMANCE_NOW();
v8_initialized = true;
const int exit_code =
Start(uv_default_loop(), argc, argv, exec_argc, exec_argv);
Expand Down