Changeset: 701072d3095a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=701072d3095a Modified Files: sql/backends/monet5/sql_cast.h Branch: default Log Message:
Fixed after incorrectly solving merge conflict. diffs (12 lines): diff --git a/sql/backends/monet5/sql_cast.h b/sql/backends/monet5/sql_cast.h --- a/sql/backends/monet5/sql_cast.h +++ b/sql/backends/monet5/sql_cast.h @@ -75,7 +75,7 @@ CAST_FLOATINGPOINT_2_INTEGER_2(T1,sht); CAST_FLOATINGPOINT_2_INTEGER_2(T1,int); \ CAST_FLOATINGPOINT_2_INTEGER_2(T1,wrd); \ CAST_FLOATINGPOINT_2_INTEGER_2(T1,lng); \ -CAST_FLOATINGPOINT_2_INTEGER_2(T1,hge) +CAST_FLOATINGPOINT_2_INTEGER_2_hge(T1) CAST_FLOATINGPOINT_2_INTEGER_1(flt); CAST_FLOATINGPOINT_2_INTEGER_1(dbl); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
