Skip to content

Commit 86df98d

Browse files
committed
revert to later shim method
1 parent de798a7 commit 86df98d

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: nanonext
22
Type: Package
33
Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
4-
Version: 0.13.6.9014
4+
Version: 0.13.6.9015
55
Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
66
a socket library implementing 'Scalability Protocols', a reliable,
77
high-performance standard for common communications patterns including

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nanonext 0.13.6.9014 (development)
1+
# nanonext 0.13.6.9015 (development)
22

33
#### New Features
44

src/init.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ SEXP nano_unresolved;
5353

5454
SEXP nano_precious;
5555

56-
static void (*eln2)(void (*)(void *), void *, double, int);
57-
58-
void later2(void (*fun)(void *), void *data) {
59-
eln2(fun, data, 0, 0);
60-
}
61-
6256
static void RegisterSymbols(void) {
6357
nano_AioSymbol = Rf_install("aio");
6458
nano_ContextSymbol = Rf_install("context");
@@ -201,7 +195,6 @@ static const R_ExternalMethodDef externalMethods[] = {
201195
void attribute_visible R_init_nanonext(DllInfo* dll) {
202196
RegisterSymbols();
203197
PreserveObjects();
204-
eln2 = (void (*)(void (*)(void *), void *, double, int)) R_GetCCallable("later", "execLaterNative2");
205198
R_registerRoutines(dll, NULL, callMethods, NULL, externalMethods);
206199
R_useDynamicSymbols(dll, FALSE);
207200
R_forceSymbols(dll, TRUE);

src/later_shim.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#include <later_api.h>
2+
3+
extern "C" void later2(void (*func)(void*), void* data) {
4+
later::later(func, data, 0);
5+
}

0 commit comments

Comments
 (0)