Changeset: 7909f80549ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7909f80549ef
Modified Files:
gdk/gdk.h
Branch: default
Log Message:
reverting changeset 9d29280ca32e to make room for different (better?) solution
diffs (40 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2970,22 +2970,19 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b
*/
#define HASHlooploc(bi, h, hb, v) \
for (hb = HASHget(h, HASHprobe(h, v)); \
- TRUE; \
+ hb != HASHnil(h); \
hb = HASHgetlink(h,hb)) \
- if ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \
if (ATOMcmp(h->type, v, BUNhloc(bi, hb)) == 0)
#define HASHloopvar(bi, h, hb, v) \
for (hb = HASHget(h,HASHprobe(h, v)); \
- TRUE; \
+ hb != HASHnil(h); \
hb = HASHgetlink(h,hb)) \
- if ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \
if (ATOMcmp(h->type, v, BUNhvar(bi, hb)) == 0)
#define HASHloop_TYPE(bi, h, hb, v, TYPE) \
for (hb = HASHget(h, hash_##TYPE(h, v)); \
- TRUE; \
+ hb != HASHnil(h); \
hb = HASHgetlink(h,hb)) \
- if ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \
if (simple_EQ(v, BUNhloc(bi, hb), TYPE))
#define HASHloop_bit(bi, h, hb, v) HASHloop_TYPE(bi, h, hb, v, bte)
@@ -3002,9 +2999,8 @@ gdk_export int ALIGNsetH(BAT *b1, BAT *b
#define HASHloop_any(bi, h, hb, v) \
for (hb = HASHget(h, hash_any(h, v)); \
- TRUE; \
+ hb != HASHnil(h); \
hb = HASHgetlink(h,hb)) \
- if ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \
if (atom_EQ(v, BUNhead(bi, hb), (bi).b->htype))
/*
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
