Changeset: e94e50e0fcd8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e94e50e0fcd8 Modified Files: sql/backends/monet5/sql_cast.h Branch: default Log Message:
If HAVE_HGE is not defined, we don't want a stray ; among the declarations. diffs (77 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 @@ -29,7 +29,7 @@ sql5_export str bat##T1##_dec2_##T2(bat sql5_export str T1##_dec2dec_##T2(T2 *res, const int *S1, const T1 *v, const int *d2, const int *S2); \ sql5_export str bat##T1##_dec2dec_##T2(bat *res, const int *S1, const bat *v, const int *d2, const int *S2); \ sql5_export str T1##_num2dec_##T2(T2 *res, const T1 *v, const int *d2, const int *s2); \ -sql5_export str bat##T1##_num2dec_##T2(bat *res, const bat *v, const int *d2, const int *s2) +sql5_export str bat##T1##_num2dec_##T2(bat *res, const bat *v, const int *d2, const int *s2); #ifdef HAVE_HGE #define CAST_INTEGER_2_NUMERIC_2_hge(T1) CAST_INTEGER_2_NUMERIC_2(T1,hge) @@ -38,22 +38,22 @@ sql5_export str bat##T1##_num2dec_##T2(b #endif #define CAST_INTEGER_2_NUMERIC_1(T1) \ -CAST_INTEGER_2_NUMERIC_2(T1,bte); \ -CAST_INTEGER_2_NUMERIC_2(T1,sht); \ -CAST_INTEGER_2_NUMERIC_2(T1,int); \ -CAST_INTEGER_2_NUMERIC_2(T1,wrd); \ -CAST_INTEGER_2_NUMERIC_2(T1,lng); \ -CAST_INTEGER_2_NUMERIC_2_hge(T1); \ -CAST_INTEGER_2_NUMERIC_2(T1,flt); \ +CAST_INTEGER_2_NUMERIC_2(T1,bte) \ +CAST_INTEGER_2_NUMERIC_2(T1,sht) \ +CAST_INTEGER_2_NUMERIC_2(T1,int) \ +CAST_INTEGER_2_NUMERIC_2(T1,wrd) \ +CAST_INTEGER_2_NUMERIC_2(T1,lng) \ +CAST_INTEGER_2_NUMERIC_2_hge(T1) \ +CAST_INTEGER_2_NUMERIC_2(T1,flt) \ CAST_INTEGER_2_NUMERIC_2(T1,dbl) -CAST_INTEGER_2_NUMERIC_1(bte); -CAST_INTEGER_2_NUMERIC_1(sht); -CAST_INTEGER_2_NUMERIC_1(int); -CAST_INTEGER_2_NUMERIC_1(wrd); -CAST_INTEGER_2_NUMERIC_1(lng); +CAST_INTEGER_2_NUMERIC_1(bte) +CAST_INTEGER_2_NUMERIC_1(sht) +CAST_INTEGER_2_NUMERIC_1(int) +CAST_INTEGER_2_NUMERIC_1(wrd) +CAST_INTEGER_2_NUMERIC_1(lng) #ifdef HAVE_HGE -CAST_INTEGER_2_NUMERIC_1(hge); +CAST_INTEGER_2_NUMERIC_1(hge) #endif @@ -61,7 +61,7 @@ CAST_INTEGER_2_NUMERIC_1(hge); sql5_export str T1##_2_##T2(T2 *res, const T1 *v); \ sql5_export str bat##T1##_2_##T2(bat *res, const bat *v); \ sql5_export str T1##_num2dec_##T2(T2 *res, const T1 *v, const int *d2, const int *s2); \ -sql5_export str bat##T1##_num2dec_##T2(bat *res, const bat *v, const int *d2, const int *s2) +sql5_export str bat##T1##_num2dec_##T2(bat *res, const bat *v, const int *d2, const int *s2); #ifdef HAVE_HGE #define CAST_FLOATINGPOINT_2_INTEGER_2_hge(T1) CAST_FLOATINGPOINT_2_INTEGER_2(T1,hge) @@ -70,12 +70,12 @@ sql5_export str bat##T1##_num2dec_##T2(b #endif #define CAST_FLOATINGPOINT_2_INTEGER_1(T1) \ -CAST_FLOATINGPOINT_2_INTEGER_2(T1,bte); \ -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,bte) \ +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_hge(T1) -CAST_FLOATINGPOINT_2_INTEGER_1(flt); -CAST_FLOATINGPOINT_2_INTEGER_1(dbl); +CAST_FLOATINGPOINT_2_INTEGER_1(flt) +CAST_FLOATINGPOINT_2_INTEGER_1(dbl) _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
