Changeset: 884da55bc36c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=884da55bc36c
Modified Files:
monetdb5/modules/atoms/json_atom.c
monetdb5/modules/atoms/json_atom.mal
Branch: default
Log Message:
Fix compilation
diffs (33 lines):
diff --git a/monetdb5/modules/atoms/json_atom.c
b/monetdb5/modules/atoms/json_atom.c
--- a/monetdb5/modules/atoms/json_atom.c
+++ b/monetdb5/modules/atoms/json_atom.c
@@ -902,7 +902,7 @@ str JSONarrayvalues(int *ret, BAT *bn, c
{
char *valuebegin,*valueend, *msg= MAL_SUCCEED;
char *result = NULL;
- int l,lim;
+ size_t l,lim;
skipblancs;
if ( *j != '[' )
@@ -953,7 +953,7 @@ JSONvalues(int *ret, json *js)
char *valuebegin,*valueend;
char *msg= MAL_SUCCEED;
char *result = NULL;
- int l,lim;
+ size_t l,lim;
char *j = *js;
bn = BATnew(TYPE_void,TYPE_str,64);
diff --git a/monetdb5/modules/atoms/json_atom.mal
b/monetdb5/modules/atoms/json_atom.mal
--- a/monetdb5/modules/atoms/json_atom.mal
+++ b/monetdb5/modules/atoms/json_atom.mal
@@ -79,7 +79,7 @@ comment "Nest the key-value pairs with o
pattern nest(k:bat[:oid,:str],v:bat[:oid,:any]):json
address JSONnest
-comment "Combine the key-value pairs into a single json object.";
+comment "Combine the key-value pairs into a single json object list.";
pattern nest(k:bat[:oid,:str]):json
address JSONnest;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
