Changeset: edf6d672dd00 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edf6d672dd00
Modified Files:
sql/backends/monet5/UDF/capi/Tests/capi00.sql
sql/backends/monet5/UDF/capi/capi.c
Branch: jitudf
Log Message:
Compilation fixes.
diffs (44 lines):
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi00.sql
b/sql/backends/monet5/UDF/capi/Tests/capi00.sql
--- a/sql/backends/monet5/UDF/capi/Tests/capi00.sql
+++ b/sql/backends/monet5/UDF/capi/Tests/capi00.sql
@@ -14,4 +14,6 @@ INSERT INTO integers VALUES (1), (2), (3
SELECT capi00(i) FROM integers;
+DROP FUNCTION capi00;
+
ROLLBACK;
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -228,14 +228,12 @@ static void* add_allocated_region(void*
static void *wrapped_GDK_malloc(size_t size)
{
- allocated_region *region;
void *ptr = jump_GDK_malloc(size + sizeof(allocated_region));
return add_allocated_region(ptr);
}
static void *wrapped_GDK_malloc_nojump(size_t size)
{
- allocated_region *region;
void *ptr = GDKmalloc(size + sizeof(allocated_region));
if (!ptr) {
return NULL;
@@ -1076,7 +1074,6 @@ static str CUDFeval(Client cntxt, MalBlk
// unsupported type: convert to string
BATiter li;
BUN p = 0, q = 0;
- str mprotect_retval;
GENERATE_BAT_INPUT_BASE(str);
bat_data->count = BATcount(input_bats[index]);
bat_data->null_value = NULL;
@@ -1372,7 +1369,6 @@ static str CUDFeval(Client cntxt, MalBlk
if (!ptr || strcmp(ptr, str_nil) == 0) {
appended_element = (void*)
BATatoms[bat_type].atomNull;
} else {
- int len = 0;
if (BATatoms[bat_type].atomFromStr(ptr,
&len, &element) == 0) {
msg = createException(MAL,
"cudf.eval", "Failed to convert output element from string: %s", ptr);
goto wrapup;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
