chakrashim: Fix for nan v2.2 APIs

`GCPrologueCallback ` and `GCEpilogueCallback ` is replaced by `GCCallback`. Reviewed-By @jianchun
nodejs · Jan 12, 2016 · ee68330 · ee68330
1 parent 6bc3ef3
commit ee68330
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/deps/chakrashim/include/v8.h b/deps/chakrashim/include/v8.h
@@ -2138,12 +2138,14 @@ class V8_EXPORT Isolate {
     Isolate* isolate, GCType type, GCCallbackFlags flags);
   typedef void (*GCEpilogueCallback)(
     Isolate* isolate, GCType type, GCCallbackFlags flags);
+  typedef void(*GCCallback)(Isolate* isolate, GCType type,
+                            GCCallbackFlags flags);
   void AddGCPrologueCallback(
-    GCPrologueCallback callback, GCType gc_type_filter = kGCTypeAll);
-  void RemoveGCPrologueCallback(GCPrologueCallback callback);
+    GCCallback callback, GCType gc_type_filter = kGCTypeAll);
+  void RemoveGCPrologueCallback(GCCallback callback);
   void AddGCEpilogueCallback(
-    GCEpilogueCallback callback, GCType gc_type_filter = kGCTypeAll);
-  void RemoveGCEpilogueCallback(GCEpilogueCallback callback);
+    GCCallback callback, GCType gc_type_filter = kGCTypeAll);
+  void RemoveGCEpilogueCallback(GCCallback callback);
 
   void SetCounterFunction(CounterLookupCallback);
   void SetCreateHistogramFunction(CreateHistogramCallback);

diff --git a/deps/chakrashim/src/v8isolate.cc b/deps/chakrashim/src/v8isolate.cc
@@ -123,17 +123,17 @@ CpuProfiler* Isolate::GetCpuProfiler() {
 }
 
 void Isolate::AddGCPrologueCallback(
-    GCPrologueCallback callback, GCType gc_type_filter) {
+  GCCallback callback, GCType gc_type_filter) {
 }
 
-void Isolate::RemoveGCPrologueCallback(GCPrologueCallback callback) {
+void Isolate::RemoveGCPrologueCallback(GCCallback callback) {
 }
 
 void Isolate::AddGCEpilogueCallback(
-    GCEpilogueCallback callback, GCType gc_type_filter) {
+  GCCallback callback, GCType gc_type_filter) {
 }
 
-void Isolate::RemoveGCEpilogueCallback(GCEpilogueCallback callback) {
+void Isolate::RemoveGCEpilogueCallback(GCCallback callback) {
 }
 
 void Isolate::SetCounterFunction(CounterLookupCallback) {