Changeset: 5f168c6a79e6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/5f168c6a79e6 Modified Files: sql/server/sql_atom.c Branch: default Log Message:
Merged with Oct2020 diffs (17 lines): diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c --- a/sql/server/sql_atom.c +++ b/sql/server/sql_atom.c @@ -1278,12 +1278,7 @@ atom_cast(sql_allocator *sa, atom *a, sq int tpe = tp->type->localtype; size_t len = (tpe == TYPE_dbl) ? sizeof(dbl) : sizeof(flt); ssize_t res; - ptr p; - - if (tpe == TYPE_dbl) - p = &(a->data.val.dval); - else - p = &(a->data.val.fval); + ptr p = &(a->data.val); if ((res = ATOMfromstr(tpe, &p, &len, s, false)) < 0) { GDKclrerr(); return 0; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list