Skip to content

Commit 08e69fe

Browse files
committed
Merge pull request #529 from matthewloring/gc-callbacks
Rename GC*logueCallback to GCCallback for >4.0
2 parents 50e157d + 3603435 commit 08e69fe

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

nan.h

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,25 +598,33 @@ class TryCatch {
598598
# define NAN_GC_CALLBACK(name) \
599599
void name(v8::Isolate *isolate, v8::GCType type, v8::GCCallbackFlags flags)
600600

601+
#if NODE_MODULE_VERSION <= NODE_4_0_MODULE_VERSION
602+
typedef v8::Isolate::GCEpilogueCallback GCEpilogueCallback;
603+
typedef v8::Isolate::GCPrologueCallback GCPrologueCallback;
604+
#else
605+
typedef v8::Isolate::GCCallback GCEpilogueCallback;
606+
typedef v8::Isolate::GCCallback GCPrologueCallback;
607+
#endif
608+
601609
NAN_INLINE void AddGCEpilogueCallback(
602-
v8::Isolate::GCEpilogueCallback callback
610+
GCEpilogueCallback callback
603611
, v8::GCType gc_type_filter = v8::kGCTypeAll) {
604612
v8::Isolate::GetCurrent()->AddGCEpilogueCallback(callback, gc_type_filter);
605613
}
606614

607615
NAN_INLINE void RemoveGCEpilogueCallback(
608-
v8::Isolate::GCEpilogueCallback callback) {
616+
GCEpilogueCallback callback) {
609617
v8::Isolate::GetCurrent()->RemoveGCEpilogueCallback(callback);
610618
}
611619

612620
NAN_INLINE void AddGCPrologueCallback(
613-
v8::Isolate::GCPrologueCallback callback
621+
GCPrologueCallback callback
614622
, v8::GCType gc_type_filter = v8::kGCTypeAll) {
615623
v8::Isolate::GetCurrent()->AddGCPrologueCallback(callback, gc_type_filter);
616624
}
617625

618626
NAN_INLINE void RemoveGCPrologueCallback(
619-
v8::Isolate::GCPrologueCallback callback) {
627+
GCPrologueCallback callback) {
620628
v8::Isolate::GetCurrent()->RemoveGCPrologueCallback(callback);
621629
}
622630

0 commit comments

Comments
 (0)