MonetDB: jitudf - Linux compilation fixes.

[Mark Raasveldt]

Changeset: ec71c22bf9bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec71c22bf9bc
Modified Files:
        sql/backends/monet5/UDF/capi/Tests/capi06.sql
        sql/backends/monet5/UDF/capi/capi.c
Branch: jitudf
Log Message:

Linux compilation fixes.


diffs (49 lines):

diff --git a/sql/backends/monet5/UDF/capi/Tests/capi06.sql 
b/sql/backends/monet5/UDF/capi/Tests/capi06.sql
--- a/sql/backends/monet5/UDF/capi/Tests/capi06.sql
+++ b/sql/backends/monet5/UDF/capi/Tests/capi06.sql
@@ -5,15 +5,16 @@ START TRANSACTION;
 
 CREATE FUNCTION capi06(inp INTEGER) RETURNS INTEGER LANGUAGE CPP {
 #include <vector>
-       std::vector<int> elements;
-       for(size_t i = 0; i < inp.count; i++) {
-               elements.push_back(inp.data[i]);
-       }
-       std::sort(elements.begin(), elements.end());
-       result->initialize(result, inp.count);
-       for(size_t i = 0; i < inp.count; i++) {
-               result->data[i] = elements[i];
-       }
+#include <algorithm>
+    std::vector<int> elements;
+    for(size_t i = 0; i < inp.count; i++) {
+        elements.push_back(inp.data[i]);
+    }
+    std::sort(elements.begin(), elements.end());
+    result->initialize(result, inp.count);
+    for(size_t i = 0; i < inp.count; i++) {
+        result->data[i] = elements[i];
+    }
 };
 
 CREATE TABLE integers(i INTEGER);
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
@@ -169,7 +169,7 @@ static void *wrapped_GDK_malloc(size_t s
        region->next = allocated_regions;
        allocated_regions = region;
 
-       return ptr + sizeof(allocated_region);
+       return (char*)ptr + sizeof(allocated_region);
 }
 
 #define GENERATE_BASE_HEADERS(type, tpename)                                   
\
@@ -571,6 +571,7 @@ static str CUDFeval(Client cntxt, MalBlk
                                                ATTEMPT_TO_WRITE_DATA_TO_FILE(f,
                                                                                
                          exprStr + preprocessor_start,
                                                                                
                          i - preprocessor_start);
+                                               ATTEMPT_TO_WRITE_TO_FILE(f, 
"\n");
                                                for (j = preprocessor_start; j 
< i; j++) {
                                                        // now overwrite the 
preprocessor directive in the
                                                        // expression string 
with spaces
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list