diff --git a/src/spawn_sync.h b/src/spawn_sync.h index 806431846691db..fed14532960326 100644 --- a/src/spawn_sync.h +++ b/src/spawn_sync.h @@ -29,18 +29,6 @@ namespace node { -using v8::Array; -using v8::Context; -using v8::FunctionCallbackInfo; -using v8::HandleScope; -using v8::Integer; -using v8::Isolate; -using v8::Local; -using v8::Null; -using v8::Number; -using v8::Object; -using v8::String; -using v8::Value; class SyncProcessOutputBuffer; @@ -94,7 +82,7 @@ class SyncProcessStdioPipe { int Start(); void Close(); - Local GetOutputAsBuffer(Environment* env) const; + v8::Local GetOutputAsBuffer(Environment* env) const; inline bool readable() const; inline bool writable() const; @@ -151,10 +139,10 @@ class SyncProcessRunner { }; public: - static void Initialize(Local target, - Local unused, - Local context); - static void Spawn(const FunctionCallbackInfo& args); + static void Initialize(v8::Local target, + v8::Local unused, + v8::Local context); + static void Spawn(const v8::FunctionCallbackInfo& args); private: friend class SyncProcessStdioPipe; @@ -164,8 +152,8 @@ class SyncProcessRunner { inline Environment* env() const; - Local Run(Local options); - void TryInitializeAndRunLoop(Local options); + v8::Local Run(v8::Local options); + void TryInitializeAndRunLoop(v8::Local options); void CloseHandlesAndDeleteLoop(); void CloseStdioPipes(); @@ -181,12 +169,12 @@ class SyncProcessRunner { void SetError(int error); void SetPipeError(int pipe_error); - Local BuildResultObject(); - Local BuildOutputArray(); + v8::Local BuildResultObject(); + v8::Local BuildOutputArray(); - int ParseOptions(Local js_value); - int ParseStdioOptions(Local js_value); - int ParseStdioOption(int child_fd, Local js_stdio_option); + int ParseOptions(v8::Local js_value); + int ParseStdioOptions(v8::Local js_value); + int ParseStdioOption(int child_fd, v8::Local js_stdio_option); inline int AddStdioIgnore(uint32_t child_fd); inline int AddStdioPipe(uint32_t child_fd, @@ -195,9 +183,9 @@ class SyncProcessRunner { uv_buf_t input_buffer); inline int AddStdioInheritFD(uint32_t child_fd, int inherit_fd); - static bool IsSet(Local value); - int CopyJsString(Local js_value, const char** target); - int CopyJsStringArray(Local js_value, char** target); + static bool IsSet(v8::Local value); + int CopyJsString(v8::Local js_value, const char** target); + int CopyJsStringArray(v8::Local js_value, char** target); static void ExitCallback(uv_process_t* handle, int64_t exit_status,