fixup! src: use RAII to manage the main isolate data

nodejs · Apr 16, 2019 · 51eb301 · 51eb301
1 parent dc8cde7
commit 51eb301
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
@@ -17,7 +17,7 @@ NodeMainInstance::NodeMainInstance(uv_loop_t* event_loop,
                                    const std::vector<std::string>& exec_args)
     : args_(args),
       exec_args_(exec_args),
-      array_buffer_allocator_(CreateArrayBufferAllocator()),
+      array_buffer_allocator_(ArrayBufferAllocator::Create()),
       isolate_(nullptr),
       isolate_data_(nullptr) {
   // TODO(joyeecheung): when we implement snapshot integration this needs to

diff --git a/src/node_main_instance.h b/src/node_main_instance.h
@@ -19,9 +19,9 @@ class NodeMainInstance {
   NodeMainInstance(NodeMainInstance&&) = delete;
   NodeMainInstance& operator=(NodeMainInstance&&) = delete;
 
-  explicit NodeMainInstance(uv_loop_t* event_loop,
-                            const std::vector<std::string>& args,
-                            const std::vector<std::string>& exec_args);
+  NodeMainInstance(uv_loop_t* event_loop,
+                   const std::vector<std::string>& args,
+                   const std::vector<std::string>& exec_args);
   ~NodeMainInstance();
 
   // Start running the Node.js instances, return the exit code when finished.
@@ -34,10 +34,9 @@ class NodeMainInstance {
 
   std::vector<std::string> args_;
   std::vector<std::string> exec_args_;
-  DeleteFnPtr<ArrayBufferAllocator, FreeArrayBufferAllocator>
-      array_buffer_allocator_;
+  std::unique_ptr<ArrayBufferAllocator> array_buffer_allocator_;
   v8::Isolate* isolate_;
-  DeleteFnPtr<IsolateData, FreeIsolateData> isolate_data_;
+  std::unique_ptr<IsolateData> isolate_data_;
 };
 
 }  // namespace node