nodejs
diff --git a/‎src/env-inl.h‎
Lines changed: 2 additions & 2 deletions b/‎src/env-inl.h‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/env.h‎
Lines changed: 7 additions & 4 deletions b/‎src/env.h‎
Lines changed: 7 additions & 4 deletions
@@ -1041,15 +1041,15 @@ inline void Environment::SetInstanceMethod(v8::Local<v8::FunctionTemplate> that,
   t->SetClassName(name_string);
 }
 
-void Environment::AddCleanupHook(void (*fn)(void*), void* arg) {
+void Environment::AddCleanupHook(CleanupCallback fn, void* arg) {
   auto insertion_info = cleanup_hooks_.emplace(CleanupHookCallback {
     fn, arg, cleanup_hook_counter_++
   });
   // Make sure there was no existing element with these values.
   CHECK_EQ(insertion_info.second, true);
 }
 
-void Environment::RemoveCleanupHook(void (*fn)(void*), void* arg) {
+void Environment::RemoveCleanupHook(CleanupCallback fn, void* arg) {
   CleanupHookCallback search { fn, arg, 0 };
   cleanup_hooks_.erase(search);
 }
 
@@ -789,7 +789,9 @@ class ShouldNotAbortOnUncaughtScope {
 
 class CleanupHookCallback {
  public:
-  CleanupHookCallback(void (*fn)(void*),
+  typedef void (*Callback)(void*);
+
+  CleanupHookCallback(Callback fn,
                       void* arg,
                       uint64_t insertion_order_counter)
       : fn_(fn), arg_(arg), insertion_order_counter_(insertion_order_counter) {}
@@ -809,7 +811,7 @@ class CleanupHookCallback {
 
  private:
   friend class Environment;
-  void (*fn_)(void*);
+  Callback fn_;
   void* arg_;
 
   // We keep track of the insertion order for these objects, so that we can
@@ -1171,8 +1173,9 @@ class Environment : public MemoryRetainer {
   void ScheduleTimer(int64_t duration);
   void ToggleTimerRef(bool ref);
 
-  inline void AddCleanupHook(void (*fn)(void*), void* arg);
-  inline void RemoveCleanupHook(void (*fn)(void*), void* arg);
+  using CleanupCallback = CleanupHookCallback::Callback;
+  inline void AddCleanupHook(CleanupCallback cb, void* arg);
+  inline void RemoveCleanupHook(CleanupCallback cb, void* arg);
   void RunCleanup();
 
   static void BuildEmbedderGraph(v8::Isolate* isolate,
Original file line number	Diff line number	Diff line change
@@ -1041,15 +1041,15 @@ inline void Environment::SetInstanceMethod(v8::Local<v8::FunctionTemplate> that,
1041	1041	t->SetClassName(name_string);
1042	1042	}
1043	1043
1044		- void Environment::AddCleanupHook(void (fn)(void), void* arg) {
	1044	+ void Environment::AddCleanupHook(CleanupCallback fn, void* arg) {
1045	1045	auto insertion_info = cleanup_hooks_.emplace(CleanupHookCallback {
1046	1046	fn, arg, cleanup_hook_counter_++
1047	1047	});
1048	1048	// Make sure there was no existing element with these values.
1049	1049	CHECK_EQ(insertion_info.second, true);
1050	1050	}
1051	1051
1052		- void Environment::RemoveCleanupHook(void (fn)(void), void* arg) {
	1052	+ void Environment::RemoveCleanupHook(CleanupCallback fn, void* arg) {
1053	1053	CleanupHookCallback search { fn, arg, 0 };
1054	1054	cleanup_hooks_.erase(search);
1055	1055	}