MonetDB: embedded-java - Avoid using C long for lng columns

[Dimitar Nedev]

Changeset: 1d51cb90550b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d51cb90550b
Modified Files:
        java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
Branch: embedded-java
Log Message:

Avoid using C long for lng columns


diffs (30 lines):

diff --git a/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c 
b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
--- a/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
+++ b/java/embedded/org_monetdb_embedded_result_EmbeddedQueryResult.c
@@ -197,22 +197,22 @@ static jobject getLongColumn(JNIEnv *env
        jmethodID columnConstructor = (*env)->GetMethodID(env, columnClass, 
"<init>", "([JI[Z)V");
 
        int i = 0;
-       long val_tmp[size];
+       jlong val_tmp[size];
        jboolean nul_tmp[size];
        if (b->T->nonil && !b->T->nil) {
                for (i = 0; i < size; i++) {
-                       val_tmp[i] = (long) ((long*) Tloc(b, BUNfirst(b)))[i];
+                       val_tmp[i] = (lng) ((lng*) Tloc(b, BUNfirst(b)))[i];
                        nul_tmp[i] = false;
                }
        }
        else {
                for (i = 0; i < size; i++) {
-                       long v = ((long*) Tloc(b, BUNfirst(b)))[i];
+                       lng v = ((lng*) Tloc(b, BUNfirst(b)))[i];
                        if (v == lng_nil) {
                                val_tmp[i] = 0;
                                nul_tmp[i] = true;
                        } else {
-                               val_tmp[i] = (long)v;
+                               val_tmp[i] = (lng)v;
                                nul_tmp[i] = false;
                        }
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list