Changeset: 70e83ff3fe4c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/70e83ff3fe4c Modified Files: monetdb5/modules/mal/manifold.c Branch: pp_hashjoin Log Message:
set with proper types
diffs (44 lines):
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -89,11 +89,11 @@ typedef struct {
args[i] += mut->args[i].size;
\
} else if
(ATOMvarsized(mut->args[i].type)) { \
mut->args[i].o++;
\
- mut->args[i].s = (str *)
BUNtvar(&mut->args[i].bi, mut->args[i].o); \
+ mut->args[i].s = (const str *)
BUNtvar(&mut->args[i].bi, mut->args[i].o); \
args[i] = (void *)
&mut->args[i].s; \
} else {
\
mut->args[i].o++;
\
- mut->args[i].s = (str *)
BUNtloc(&mut->args[i].bi, mut->args[i].o); \
+ mut->args[i].s = (const str *)
BUNtloc(&mut->args[i].bi, mut->args[i].o); \
args[i] = (void*)
&mut->args[i].s; \
}
\
}
\
@@ -117,11 +117,11 @@ typedef struct {
args[i] += mut->args[i].size;
\
} else if
(ATOMvarsized(mut->args[i].type)) { \
mut->args[i].o++;
\
- mut->args[i].s = (str *)
BUNtvar(&mut->args[i].bi, mut->args[i].o); \
+ mut->args[i].s = (const str *)
BUNtvar(&mut->args[i].bi, mut->args[i].o); \
args[i] = (void *)
&mut->args[i].s; \
} else {
\
mut->args[i].o++;
\
- mut->args[i].s = (str *)
BUNtloc(&mut->args[i].bi, mut->args[i].o); \
+ mut->args[i].s = (const str *)
BUNtloc(&mut->args[i].bi, mut->args[i].o); \
args[i] = (void*)
&mut->args[i].s; \
}
\
}
\
@@ -159,10 +159,10 @@ MANIFOLDjob(MULTItask *mut, MALfcn mfcn)
if (ATOMstorage(mut->args[i].type) < TYPE_str) {
args[i] = (char *) mut->args[i].first;
} else if (ATOMvarsized(mut->args[i].type)) {
- mut->args[i].s = BUNtvar(&mut->args[i].bi,
mut->args[i].o);
+ mut->args[i].s = (const str
*)BUNtvar(&mut->args[i].bi, mut->args[i].o);
args[i] = (void *) &mut->args[i].s;
} else {
- mut->args[i].s = BUNtloc(&mut->args[i].bi,
mut->args[i].o);
+ mut->args[i].s = (const str
*)BUNtloc(&mut->args[i].bi, mut->args[i].o);
args[i] = (void *) &mut->args[i].s;
}
} else {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
