Add GET_PROTOTYPE macro

Co-authored-by: Joshua Wise <joshuathomaswise@gmail.com>

Author: m4heshd

src/better_sqlite3.cpp

@@ -12,11 +12,6 @@
 #include <node_object_wrap.h>
 #include <node_buffer.h>
 
-// v8::Object::GetPrototype has been deprecated. See http://crbug.com/333672197
-#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >= 13
-#define USE_GETPROTOTYPEV2
-#endif
-
 struct Addon;
 class Database;
 class Statement;

src/objects/statement.cpp

@@ -363,11 +363,7 @@ NODE_METHOD(Statement::JS_columns) {
 		);
 		columns.emplace_back(
 			v8::Object::New(isolate,
-				#ifdef USE_GETPROTOTYPEV2
-				v8::Object::New(isolate)->GetPrototypeV2(),
-				#else
-				v8::Object::New(isolate)->GetPrototype(),
-				#endif
+				GET_PROTOTYPE(v8::Object::New(isolate)),
 				keys.data(),
 				values.data(),
 				keys.size()

src/util/binder.cpp

@@ -33,18 +33,10 @@ class Binder {
 	};
 
 	static bool IsPlainObject(v8::Isolate* isolate, v8::Local<v8::Object> obj) {
-		#ifdef USE_GETPROTOTYPEV2
-		v8::Local<v8::Value> proto = obj->GetPrototypeV2();
-		#else
-		v8::Local<v8::Value> proto = obj->GetPrototype();
-		#endif
+		v8::Local<v8::Value> proto = GET_PROTOTYPE(obj);
 		v8::Local<v8::Context> ctx = obj->GetCreationContext().ToLocalChecked();
 		ctx->Enter();
-		#ifdef USE_GETPROTOTYPEV2
-		v8::Local<v8::Value> baseProto = v8::Object::New(isolate)->GetPrototypeV2();
-		#else
-		v8::Local<v8::Value> baseProto = v8::Object::New(isolate)->GetPrototype();
-		#endif
+		v8::Local<v8::Value> baseProto = GET_PROTOTYPE(v8::Object::New(isolate));
 		ctx->Exit();
 		return proto->StrictEquals(baseProto) || proto->StrictEquals(v8::Null(isolate));
 	}

src/util/data.cpp

@@ -146,11 +146,7 @@ namespace Data {
 		}
 		return v8::Object::New(
 			isolate,
-			#ifdef USE_GETPROTOTYPEV2
-			v8::Object::New(isolate)->GetPrototypeV2(),
-			#else
-			v8::Object::New(isolate)->GetPrototype(),
-			#endif
+			GET_PROTOTYPE(v8::Object::New(isolate)),
 			keys.data(),
 			values.data(),
 			column_count

src/util/macros.cpp

@@ -4,6 +4,13 @@
 #define NODE_GETTER(name) void name(v8::Local<v8::Name> _, const v8::PropertyCallbackInfo<v8::Value>& info)
 #define INIT(name) v8::Local<v8::Function> name(v8::Isolate* isolate, v8::Local<v8::External> data)
 
+#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >= 13
+// v8::Object::GetPrototype has been deprecated. See http://crbug.com/333672197
+#define GET_PROTOTYPE(obj) ((obj)->GetPrototypeV2())
+#else
+#define GET_PROTOTYPE(obj) ((obj)->GetPrototype())
+#endif
+
 #define EasyIsolate v8::Isolate* isolate = v8::Isolate::GetCurrent()
 #define OnlyIsolate info.GetIsolate()
 #define OnlyContext isolate->GetCurrentContext()

src/util/row-builder.cpp

@@ -33,11 +33,7 @@ class RowBuilder {
 		}
 
 		return v8::Object::New(isolate,
-			#ifdef USE_GETPROTOTYPEV2
-			v8::Object::New(isolate)->GetPrototypeV2(),
-			#else
-			v8::Object::New(isolate)->GetPrototype(),
-			#endif
+			GET_PROTOTYPE(v8::Object::New(isolate)),
 			keys.data(),
 			values.data(),
 			column_count