Skip to content

Commit 39a3d6d

Browse files
rathbomaclaude
rathboma
and
claude
committed
Fix compilation with Node.js 22.21.1
- Replace deprecated exports->GetIsolate() with Isolate::GetCurrent() - Update uv_after_work_cb function signatures to include status parameter - Remove unnecessary function pointer casts - Update direct callback invocations to pass status parameter 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
1 parent 79af05a commit 39a3d6d

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎src/h/connection.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ class Connection : public ObjectWrap
153153
static Persistent<Function> constructor;
154154

155155
/// @internal
156-
static void noParamAfter(uv_work_t *req);
156+
static void noParamAfter(uv_work_t *req, int status);
157157
/// @internal
158-
static void connectAfter(uv_work_t *req);
158+
static void connectAfter(uv_work_t *req, int status);
159159
/// @internal
160160
static void connectWork(uv_work_t *req);
161161
/// @internal
@@ -368,7 +368,7 @@ class Connection : public ObjectWrap
368368
static NODE_API_FUNC(prepare);
369369

370370
/// @internal
371-
static void prepareAfter(uv_work_t *req);
371+
static void prepareAfter(uv_work_t *req, int status);
372372
/// @internal
373373
static void prepareWork(uv_work_t *req);
374374

‎src/h/sqlany_utils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ struct noParamBaton
185185
}
186186
};
187187

188-
void executeAfter(uv_work_t *req);
188+
void executeAfter(uv_work_t *req, int status);
189189
void executeWork(uv_work_t *req);
190190

191191
void HashToString(Isolate *isolate, Local<Object> obj, Persistent<String> &ret);

‎src/h/stmt.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class StmtObject : public node::ObjectWrap
122122
static NODE_API_FUNC(drop);
123123

124124
/// @internal
125-
static void dropAfter(uv_work_t *req);
125+
static void dropAfter(uv_work_t *req, int status);
126126
/// @internal
127127
static void dropWork(uv_work_t *req);
128128

‎src/sqlanywhere.cpp‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void executeWork(uv_work_t *req)
193193
}
194194
}
195195

196-
void executeAfter(uv_work_t *req)
196+
void executeAfter(uv_work_t *req, int status)
197197
/*********************************/
198198
{
199199
Isolate *isolate = Isolate::GetCurrent();
@@ -299,7 +299,7 @@ NODE_API_FUNC(StmtObject::exec)
299299

300300
int status;
301301
status = uv_queue_work(uv_default_loop(), req, executeWork,
302-
(uv_after_work_cb)executeAfter);
302+
executeAfter);
303303
assert(status == 0);
304304

305305
args.GetReturnValue().SetUndefined();
@@ -376,7 +376,7 @@ void getMoreResultsWork(uv_work_t *req)
376376
}
377377
}
378378

379-
void getMoreResultsAfter(uv_work_t *req)
379+
void getMoreResultsAfter(uv_work_t *req, int status)
380380
/****************************************/
381381
{
382382
Isolate *isolate = Isolate::GetCurrent();
@@ -445,7 +445,7 @@ NODE_API_FUNC(StmtObject::getMoreResults)
445445

446446
int status;
447447
status = uv_queue_work(uv_default_loop(), req, getMoreResultsWork,
448-
(uv_after_work_cb)getMoreResultsAfter);
448+
getMoreResultsAfter);
449449
assert(status == 0);
450450

451451
args.GetReturnValue().SetUndefined();
@@ -571,7 +571,7 @@ NODE_API_FUNC(Connection::exec)
571571
baton->callback.Reset(isolate, callback);
572572
int status;
573573
status = uv_queue_work(uv_default_loop(), req, executeWork,
574-
(uv_after_work_cb)executeAfter);
574+
executeAfter);
575575
assert(status == 0);
576576

577577
args.GetReturnValue().SetUndefined();
@@ -647,7 +647,7 @@ void Connection::prepareWork(uv_work_t *req)
647647
}
648648
}
649649

650-
void Connection::prepareAfter(uv_work_t *req)
650+
void Connection::prepareAfter(uv_work_t *req, int status)
651651
/**********************************************/
652652
{
653653
Isolate *isolate = Isolate::GetCurrent();
@@ -749,7 +749,7 @@ NODE_API_FUNC(Connection::prepare)
749749
baton->StmtObj.Reset(isolate, p_stmt);
750750
int status;
751751
status = uv_queue_work(uv_default_loop(), req, prepareWork,
752-
(uv_after_work_cb)prepareAfter);
752+
prepareAfter);
753753
assert(status == 0);
754754

755755
args.GetReturnValue().SetUndefined();
@@ -759,7 +759,7 @@ NODE_API_FUNC(Connection::prepare)
759759

760760
prepareWork(req);
761761
bool err = baton->err;
762-
prepareAfter(req);
762+
prepareAfter(req, 0);
763763

764764
if (err)
765765
{
@@ -877,7 +877,7 @@ void Connection::connectWork(uv_work_t *req)
877877
openConnections++;
878878
}
879879

880-
void Connection::connectAfter(uv_work_t *req)
880+
void Connection::connectAfter(uv_work_t *req, int status)
881881
/**********************************************/
882882
{
883883
Isolate *isolate = Isolate::GetCurrent();
@@ -1018,14 +1018,14 @@ NODE_API_FUNC(Connection::connect)
10181018

10191019
int status;
10201020
status = uv_queue_work(uv_default_loop(), req, connectWork,
1021-
(uv_after_work_cb)connectAfter);
1021+
connectAfter);
10221022
assert(status == 0);
10231023
args.GetReturnValue().SetUndefined();
10241024
return;
10251025
}
10261026

10271027
connectWork(req);
1028-
connectAfter(req);
1028+
connectAfter(req, 0);
10291029
args.GetReturnValue().SetUndefined();
10301030
return;
10311031
}
@@ -1104,15 +1104,15 @@ NODE_API_FUNC(Connection::disconnect)
11041104

11051105
int status;
11061106
status = uv_queue_work(uv_default_loop(), req, disconnectWork,
1107-
(uv_after_work_cb)noParamAfter);
1107+
noParamAfter);
11081108
assert(status == 0);
11091109

11101110
args.GetReturnValue().SetUndefined();
11111111
return;
11121112
}
11131113

11141114
disconnectWork(req);
1115-
noParamAfter(req);
1115+
noParamAfter(req, 0);
11161116
args.GetReturnValue().SetUndefined();
11171117
return;
11181118
}
@@ -1178,15 +1178,15 @@ NODE_API_FUNC(Connection::commit)
11781178

11791179
int status;
11801180
status = uv_queue_work(uv_default_loop(), req, commitWork,
1181-
(uv_after_work_cb)noParamAfter);
1181+
noParamAfter);
11821182
assert(status == 0);
11831183

11841184
args.GetReturnValue().SetUndefined();
11851185
return;
11861186
}
11871187

11881188
commitWork(req);
1189-
noParamAfter(req);
1189+
noParamAfter(req, 0);
11901190
args.GetReturnValue().SetUndefined();
11911191
return;
11921192
}
@@ -1252,15 +1252,15 @@ NODE_API_FUNC(Connection::rollback)
12521252

12531253
int status;
12541254
status = uv_queue_work(uv_default_loop(), req, rollbackWork,
1255-
(uv_after_work_cb)noParamAfter);
1255+
noParamAfter);
12561256
assert(status == 0);
12571257

12581258
args.GetReturnValue().SetUndefined();
12591259
return;
12601260
}
12611261

12621262
rollbackWork(req);
1263-
noParamAfter(req);
1263+
noParamAfter(req, 0);
12641264
args.GetReturnValue().SetUndefined();
12651265
return;
12661266
}
@@ -1295,7 +1295,7 @@ struct dropBaton
12951295
}
12961296
};
12971297

1298-
void StmtObject::dropAfter(uv_work_t *req)
1298+
void StmtObject::dropAfter(uv_work_t *req, int status)
12991299
/*******************************************/
13001300
{
13011301
Isolate *isolate = Isolate::GetCurrent();
@@ -1368,15 +1368,15 @@ NODE_API_FUNC(StmtObject::drop)
13681368

13691369
int status;
13701370
status = uv_queue_work(uv_default_loop(), req, dropWork,
1371-
(uv_after_work_cb)dropAfter);
1371+
dropAfter);
13721372
assert(status == 0);
13731373

13741374
args.GetReturnValue().SetUndefined();
13751375
return;
13761376
}
13771377

13781378
dropWork(req);
1379-
dropAfter(req);
1379+
dropAfter(req, 0);
13801380
args.GetReturnValue().SetUndefined();
13811381
return;
13821382
}
@@ -1385,7 +1385,7 @@ void init(Local<Object> exports)
13851385
/********************************/
13861386
{
13871387
uv_mutex_init(&api_mutex);
1388-
Isolate *isolate = exports->GetIsolate();
1388+
Isolate *isolate = Isolate::GetCurrent();
13891389
StmtObject::Init(isolate);
13901390
Connection::Init(isolate);
13911391
NODE_SET_METHOD(exports, "createConnection", Connection::NewInstance);

‎src/utils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ bool cleanAPI()
758758
// Does not take any parameters.
759759
// Create custom Baton and Callback (After) functions otherwise
760760

761-
void Connection::noParamAfter(uv_work_t *req)
761+
void Connection::noParamAfter(uv_work_t *req, int status)
762762
/*********************************************/
763763
{
764764
Isolate *isolate = Isolate::GetCurrent();

0 commit comments

Comments
 (0)