From 0fb747545179a6d8124f9e9ca56d4a7070d14f04 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Tue, 24 Nov 2020 09:19:55 +0100
Subject: [PATCH 1/2] tools: use using-declaration consistently

---
 tools/snapshot/snapshot_builder.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/snapshot/snapshot_builder.cc b/tools/snapshot/snapshot_builder.cc
index 94fe1604149c43..0637774017dc8a 100644
--- a/tools/snapshot/snapshot_builder.cc
+++ b/tools/snapshot/snapshot_builder.cc
@@ -25,7 +25,7 @@ void WriteVector(std::stringstream* ss, const T* vec, size_t size) {
   }
 }
 
-std::string FormatBlob(v8::StartupData* blob,
+std::string FormatBlob(StartupData* blob,
                        const std::vector<size_t>& isolate_data_indexes,
                        const EnvSerializeInfo& env_info) {
   std::stringstream ss;
@@ -75,7 +75,7 @@ const EnvSerializeInfo* NodeMainInstance::GetEnvSerializeInfo() {
   return ss.str();
 }
 
-static v8::StartupData SerializeNodeContextInternalFields(Local<Object> holder,
+static StartupData SerializeNodeContextInternalFields(Local<Object> holder,
                                                           int index,
                                                           void* env) {
   void* ptr = holder->GetAlignedPointerFromInternalField(index);

From 357f471d7cdde140265f8df41cf21a04c52a45d9 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Thu, 26 Nov 2020 05:40:26 +0100
Subject: [PATCH 2/2] fixup! tools: use using-declaration consistently

---
 tools/snapshot/snapshot_builder.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/snapshot/snapshot_builder.cc b/tools/snapshot/snapshot_builder.cc
index 0637774017dc8a..eb755b7d29ed7c 100644
--- a/tools/snapshot/snapshot_builder.cc
+++ b/tools/snapshot/snapshot_builder.cc
@@ -76,8 +76,8 @@ const EnvSerializeInfo* NodeMainInstance::GetEnvSerializeInfo() {
 }
 
 static StartupData SerializeNodeContextInternalFields(Local<Object> holder,
-                                                          int index,
-                                                          void* env) {
+                                                      int index,
+                                                      void* env) {
   void* ptr = holder->GetAlignedPointerFromInternalField(index);
   if (ptr == nullptr || ptr == env) {
     return StartupData{nullptr, 0};