Skip to content

Commit 203fa2b

Browse files
neoxpertneoxpert
committed
use old signatures for older node version
1 parent a1c6df1 commit 203fa2b

File tree

3 files changed

+55
-51
lines changed

3 files changed

+55
-51
lines changed

‎src/better_sqlite3.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33

44
#include "better_sqlite3.hpp"
5-
#line 150 "./src/util/macros.lzz"
5+
#line 154 "./src/util/macros.lzz"
66
void SetPrototypeGetter(
77
v8::Isolate* isolate,
88
v8::Local<v8::External> data,
@@ -13,7 +13,7 @@ void SetPrototypeGetter(
1313
v8::HandleScope scope(isolate);
1414

1515
#if defined NODE_MODULE_VERSION && NODE_MODULE_VERSION < 121
16-
recv->InstanceTemplate()->SetNativeDataProperty(
16+
recv->InstanceTemplate()->SetAccessor(
1717
InternalizedFromLatin1(isolate, name),
1818
func,
1919
0,
@@ -30,7 +30,7 @@ void SetPrototypeGetter(
3030
);
3131
#endif
3232
}
33-
#line 180 "./src/util/macros.lzz"
33+
#line 184 "./src/util/macros.lzz"
3434
#ifndef V8_COMPRESS_POINTERS_IN_SHARED_CAGE
3535
#define SAFE_NEW_BUFFER(env, data, length, finalizeCallback, finalizeHint) node::Buffer::New(env, data, length, finalizeCallback, finalizeHint)
3636
#else
@@ -103,43 +103,43 @@ namespace Data
103103
#line 70 "./src/util/data.lzz"
104104
static char const RAW = 3;
105105
}
106-
#line 34 "./src/util/macros.lzz"
106+
#line 38 "./src/util/macros.lzz"
107107
void ThrowError (char const * message)
108-
#line 34 "./src/util/macros.lzz"
108+
#line 38 "./src/util/macros.lzz"
109109
{ v8 :: Isolate * isolate = v8 :: Isolate :: GetCurrent ( ) ; isolate->ThrowException(v8::Exception::Error(StringFromUtf8(isolate, message, -1)));
110110
}
111-
#line 35 "./src/util/macros.lzz"
111+
#line 39 "./src/util/macros.lzz"
112112
void ThrowTypeError (char const * message)
113-
#line 35 "./src/util/macros.lzz"
113+
#line 39 "./src/util/macros.lzz"
114114
{ v8 :: Isolate * isolate = v8 :: Isolate :: GetCurrent ( ) ; isolate->ThrowException(v8::Exception::TypeError(StringFromUtf8(isolate, message, -1)));
115115
}
116-
#line 36 "./src/util/macros.lzz"
116+
#line 40 "./src/util/macros.lzz"
117117
void ThrowRangeError (char const * message)
118-
#line 36 "./src/util/macros.lzz"
118+
#line 40 "./src/util/macros.lzz"
119119
{ v8 :: Isolate * isolate = v8 :: Isolate :: GetCurrent ( ) ; isolate->ThrowException(v8::Exception::RangeError(StringFromUtf8(isolate, message, -1)));
120120
}
121-
#line 102 "./src/util/macros.lzz"
121+
#line 106 "./src/util/macros.lzz"
122122
v8::Local <v8::FunctionTemplate> NewConstructorTemplate (v8::Isolate * isolate, v8::Local <v8::External> data, v8::FunctionCallback func, char const * name)
123-
#line 107 "./src/util/macros.lzz"
123+
#line 111 "./src/util/macros.lzz"
124124
{
125125
v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(isolate, func, data);
126126
t->InstanceTemplate()->SetInternalFieldCount(1);
127127
t->SetClassName(InternalizedFromLatin1(isolate, name));
128128
return t;
129129
}
130-
#line 113 "./src/util/macros.lzz"
130+
#line 117 "./src/util/macros.lzz"
131131
void SetPrototypeMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, char const * name, v8::FunctionCallback func)
132-
#line 119 "./src/util/macros.lzz"
132+
#line 123 "./src/util/macros.lzz"
133133
{
134134
v8::HandleScope scope(isolate);
135135
recv->PrototypeTemplate()->Set(
136136
InternalizedFromLatin1(isolate, name),
137137
v8::FunctionTemplate::New(isolate, func, data, v8::Signature::New(isolate, recv))
138138
);
139139
}
140-
#line 126 "./src/util/macros.lzz"
140+
#line 130 "./src/util/macros.lzz"
141141
void SetPrototypeSymbolMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, v8::Local <v8::Symbol> symbol, v8::FunctionCallback func)
142-
#line 132 "./src/util/macros.lzz"
142+
#line 136 "./src/util/macros.lzz"
143143
{
144144
v8::HandleScope scope(isolate);
145145
recv->PrototypeTemplate()->Set(

‎src/better_sqlite3.hpp

+35-35
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <node.h>
1717
#include <node_object_wrap.h>
1818
#include <node_buffer.h>
19-
#line 141 "./src/util/macros.lzz"
19+
#line 145 "./src/util/macros.lzz"
2020
void SetPrototypeGetter(
2121
v8::Isolate* isolate,
2222
v8::Local<v8::External> data,
@@ -27,37 +27,37 @@ void SetPrototypeGetter(
2727
#line 36 "./src/util/binder.lzz"
2828
static bool IsPlainObject(v8::Isolate* isolate, v8::Local<v8::Object> obj);
2929
#define LZZ_INLINE inline
30-
#line 16 "./src/util/macros.lzz"
30+
#line 20 "./src/util/macros.lzz"
3131
v8::Local <v8::String> StringFromUtf8 (v8::Isolate * isolate, char const * data, int length);
32-
#line 19 "./src/util/macros.lzz"
32+
#line 23 "./src/util/macros.lzz"
3333
v8::Local <v8::String> InternalizedFromUtf8 (v8::Isolate * isolate, char const * data, int length);
34-
#line 22 "./src/util/macros.lzz"
35-
v8::Local <v8::Value> InternalizedFromUtf8OrNull (v8::Isolate * isolate, char const * data, int length);
3634
#line 26 "./src/util/macros.lzz"
37-
v8::Local <v8::String> InternalizedFromLatin1 (v8::Isolate * isolate, char const * str);
35+
v8::Local <v8::Value> InternalizedFromUtf8OrNull (v8::Isolate * isolate, char const * data, int length);
3836
#line 30 "./src/util/macros.lzz"
39-
void SetFrozen (v8::Isolate * isolate, v8::Local <v8::Context> ctx, v8::Local <v8::Object> obj, v8::Global <v8::String> & key, v8::Local <v8::Value> value);
37+
v8::Local <v8::String> InternalizedFromLatin1 (v8::Isolate * isolate, char const * str);
4038
#line 34 "./src/util/macros.lzz"
39+
void SetFrozen (v8::Isolate * isolate, v8::Local <v8::Context> ctx, v8::Local <v8::Object> obj, v8::Global <v8::String> & key, v8::Local <v8::Value> value);
40+
#line 38 "./src/util/macros.lzz"
4141
void ThrowError (char const * message);
42-
#line 35 "./src/util/macros.lzz"
42+
#line 39 "./src/util/macros.lzz"
4343
void ThrowTypeError (char const * message);
44-
#line 36 "./src/util/macros.lzz"
44+
#line 40 "./src/util/macros.lzz"
4545
void ThrowRangeError (char const * message);
46-
#line 88 "./src/util/macros.lzz"
46+
#line 92 "./src/util/macros.lzz"
4747
bool IS_SKIPPED (char c);
48-
#line 93 "./src/util/macros.lzz"
48+
#line 97 "./src/util/macros.lzz"
4949
template <typename T>
50-
#line 93 "./src/util/macros.lzz"
50+
#line 97 "./src/util/macros.lzz"
5151
T * ALLOC_ARRAY (size_t count);
52-
#line 98 "./src/util/macros.lzz"
52+
#line 102 "./src/util/macros.lzz"
5353
template <typename T>
54-
#line 98 "./src/util/macros.lzz"
55-
void FREE_ARRAY (T * array_pointer);
5654
#line 102 "./src/util/macros.lzz"
55+
void FREE_ARRAY (T * array_pointer);
56+
#line 106 "./src/util/macros.lzz"
5757
v8::Local <v8::FunctionTemplate> NewConstructorTemplate (v8::Isolate * isolate, v8::Local <v8::External> data, v8::FunctionCallback func, char const * name);
58-
#line 113 "./src/util/macros.lzz"
58+
#line 117 "./src/util/macros.lzz"
5959
void SetPrototypeMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, char const * name, v8::FunctionCallback func);
60-
#line 126 "./src/util/macros.lzz"
60+
#line 130 "./src/util/macros.lzz"
6161
void SetPrototypeSymbolMethod (v8::Isolate * isolate, v8::Local <v8::External> data, v8::Local <v8::FunctionTemplate> recv, v8::Local <v8::Symbol> symbol, v8::FunctionCallback func);
6262
#line 1 "./src/util/constants.lzz"
6363
class CS
@@ -807,56 +807,56 @@ struct Addon
807807
#line 63 "./src/better_sqlite3.lzz"
808808
std::set <Database*, Database::CompareDatabase> dbs;
809809
};
810-
#line 16 "./src/util/macros.lzz"
810+
#line 20 "./src/util/macros.lzz"
811811
LZZ_INLINE v8::Local <v8::String> StringFromUtf8 (v8::Isolate * isolate, char const * data, int length)
812-
#line 16 "./src/util/macros.lzz"
812+
#line 20 "./src/util/macros.lzz"
813813
{
814814
return v8::String::NewFromUtf8(isolate, data, v8::NewStringType::kNormal, length).ToLocalChecked();
815815
}
816-
#line 19 "./src/util/macros.lzz"
816+
#line 23 "./src/util/macros.lzz"
817817
LZZ_INLINE v8::Local <v8::String> InternalizedFromUtf8 (v8::Isolate * isolate, char const * data, int length)
818-
#line 19 "./src/util/macros.lzz"
818+
#line 23 "./src/util/macros.lzz"
819819
{
820820
return v8::String::NewFromUtf8(isolate, data, v8::NewStringType::kInternalized, length).ToLocalChecked();
821821
}
822-
#line 22 "./src/util/macros.lzz"
822+
#line 26 "./src/util/macros.lzz"
823823
LZZ_INLINE v8::Local <v8::Value> InternalizedFromUtf8OrNull (v8::Isolate * isolate, char const * data, int length)
824-
#line 22 "./src/util/macros.lzz"
824+
#line 26 "./src/util/macros.lzz"
825825
{
826826
if (data == NULL) return v8::Null(isolate);
827827
return InternalizedFromUtf8(isolate, data, length);
828828
}
829-
#line 26 "./src/util/macros.lzz"
829+
#line 30 "./src/util/macros.lzz"
830830
LZZ_INLINE v8::Local <v8::String> InternalizedFromLatin1 (v8::Isolate * isolate, char const * str)
831-
#line 26 "./src/util/macros.lzz"
831+
#line 30 "./src/util/macros.lzz"
832832
{
833833
return v8::String::NewFromOneByte(isolate, reinterpret_cast<const uint8_t*>(str), v8::NewStringType::kInternalized).ToLocalChecked();
834834
}
835-
#line 30 "./src/util/macros.lzz"
835+
#line 34 "./src/util/macros.lzz"
836836
LZZ_INLINE void SetFrozen (v8::Isolate * isolate, v8::Local <v8::Context> ctx, v8::Local <v8::Object> obj, v8::Global <v8::String> & key, v8::Local <v8::Value> value)
837-
#line 30 "./src/util/macros.lzz"
837+
#line 34 "./src/util/macros.lzz"
838838
{
839839
obj->DefineOwnProperty(ctx, key.Get(isolate), value, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly)).FromJust();
840840
}
841-
#line 88 "./src/util/macros.lzz"
841+
#line 92 "./src/util/macros.lzz"
842842
LZZ_INLINE bool IS_SKIPPED (char c)
843-
#line 88 "./src/util/macros.lzz"
843+
#line 92 "./src/util/macros.lzz"
844844
{
845845
return c == ' ' || c == ';' || (c >= '\t' && c <= '\r');
846846
}
847-
#line 93 "./src/util/macros.lzz"
847+
#line 97 "./src/util/macros.lzz"
848848
template <typename T>
849-
#line 93 "./src/util/macros.lzz"
849+
#line 97 "./src/util/macros.lzz"
850850
LZZ_INLINE T * ALLOC_ARRAY (size_t count)
851-
#line 93 "./src/util/macros.lzz"
851+
#line 97 "./src/util/macros.lzz"
852852
{
853853
return static_cast<T*>(::operator new[](count * sizeof(T)));
854854
}
855-
#line 98 "./src/util/macros.lzz"
855+
#line 102 "./src/util/macros.lzz"
856856
template <typename T>
857-
#line 98 "./src/util/macros.lzz"
857+
#line 102 "./src/util/macros.lzz"
858858
LZZ_INLINE void FREE_ARRAY (T * array_pointer)
859-
#line 98 "./src/util/macros.lzz"
859+
#line 102 "./src/util/macros.lzz"
860860
{
861861
::operator delete[](array_pointer);
862862
}

‎src/util/macros.lzz

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#define NODE_ARGUMENTS const v8::FunctionCallbackInfo<v8::Value>&
22
#define NODE_ARGUMENTS_POINTER const v8::FunctionCallbackInfo<v8::Value>*
33
#define NODE_METHOD(name) static void name(NODE_ARGUMENTS info)
4+
#if defined NODE_MODULE_VERSION && NODE_MODULE_VERSION < 121
5+
#define NODE_GETTER(name) static void name(v8::Local<v8::String> _, const v8::PropertyCallbackInfo<v8::Value>& info)
6+
#else
47
#define NODE_GETTER(name) static void name(v8::Local<v8::Name> _, const v8::PropertyCallbackInfo<v8::Value>& info)
8+
#endif
59
#define INIT(name) static v8::Local<v8::Function> name(v8::Isolate* isolate, v8::Local<v8::External> data)
610

711
#define EasyIsolate v8::Isolate* isolate = v8::Isolate::GetCurrent()
@@ -157,7 +161,7 @@ void SetPrototypeGetter(
157161
v8::HandleScope scope(isolate);
158162

159163
#if defined NODE_MODULE_VERSION && NODE_MODULE_VERSION < 121
160-
recv->InstanceTemplate()->SetNativeDataProperty(
164+
recv->InstanceTemplate()->SetAccessor(
161165
InternalizedFromLatin1(isolate, name),
162166
func,
163167
0,

0 commit comments

Comments
 (0)