Changeset: a914111526aa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a914111526aa Modified Files: gdk/gdk.h Branch: default Log Message:
Help out compiler. Some compilers don't see the forest for the trees anymore in the old definition of BBPname, so use a different but equivalent definition. diffs (19 lines): diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1871,7 +1871,14 @@ gdk_export BBPrec *BBP[N_BBPINIT]; #define BBPcurstamp() BBP_curstamp #define BBPrefs(i) (BBPcheck((i),"BBPrefs")?BBP_refs(i):-1) #define BBPcache(i) (BBPcheck((i),"BBPcache")?BBP_cache(i):(BAT*) NULL) -#define BBPname(i) (BBPcheck((i),"BBPname")?((i) > 0 || BBP_logical(i))?BBP_logical(i):BBP_logical(-(i)):"") +#define BBPname(i) \ + (BBPcheck((i), "BBPname") ? \ + ((i) > 0 ? \ + BBP[(i) >> BBPINITLOG][(i) & (BBPINIT - 1)].logical[0] : \ + (BBP[-(i) >> BBPINITLOG][-(i) & (BBPINIT - 1)].logical[1] ? \ + BBP[-(i) >> BBPINITLOG][-(i) & (BBPINIT - 1)].logical[1] : \ + BBP[-(i) >> BBPINITLOG][-(i) & (BBPINIT - 1)].logical[0])) : \ + "") #define BBPvalid(i) (BBP_logical(i) != NULL && *BBP_logical(i) != '.') #define BATgetId(b) BBPname((b)->batCacheid) #define BBPfix(i) BBPincref((i), FALSE) _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
