Changeset: 52d7fd8bc692 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=52d7fd8bc692
Modified Files:
gdk/gdk_bat.c
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_unique.c
Branch: partitioned-hash
Log Message:
Added some casts.
diffs (143 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2859,16 +2859,16 @@ BATassertHeadProps(BAT *b)
switch (hs->width) {
case BUN2:
((BUN2type *) hs->Link)[p] = ((BUN2type
*) hs->Hash)[prb];
- ((BUN2type *) hs->Hash)[prb] = p;
+ ((BUN2type *) hs->Hash)[prb] =
(BUN2type) p;
break;
case BUN4:
((BUN4type *) hs->Link)[p] = ((BUN4type
*) hs->Hash)[prb];
- ((BUN4type *) hs->Hash)[prb] = p;
+ ((BUN4type *) hs->Hash)[prb] =
(BUN4type) p;
break;
#ifdef BUN8
case BUN8:
((BUN8type *) hs->Link)[p] = ((BUN8type
*) hs->Hash)[prb];
- ((BUN8type *) hs->Hash)[prb] = p;
+ ((BUN8type *) hs->Hash)[prb] =
(BUN8type) p;
break;
#endif
}
@@ -3122,16 +3122,16 @@ BATderiveHeadProps(BAT *b, int expensive
switch (hs->width) {
case BUN2:
((BUN2type *) hs->Link)[p] = ((BUN2type *)
hs->Hash)[prb];
- ((BUN2type *) hs->Hash)[prb] = p;
+ ((BUN2type *) hs->Hash)[prb] = (BUN2type) p;
break;
case BUN4:
((BUN4type *) hs->Link)[p] = ((BUN4type *)
hs->Hash)[prb];
- ((BUN4type *) hs->Hash)[prb] = p;
+ ((BUN4type *) hs->Hash)[prb] = (BUN4type) p;
break;
#ifdef BUN8
case BUN8:
((BUN8type *) hs->Link)[p] = ((BUN8type *)
hs->Hash)[prb];
- ((BUN8type *) hs->Hash)[prb] = p;
+ ((BUN8type *) hs->Hash)[prb] = (BUN8type) p;
break;
#endif
}
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -299,15 +299,15 @@
switch (hs->width) { \
case BUN2: \
((BUN2type *) hs->Link)[p] = ((BUN2type *)
hs->Hash)[prb]; \
- ((BUN2type *) hs->Hash)[prb] = p; \
+ ((BUN2type *) hs->Hash)[prb] = (BUN2type) p; \
break; \
case BUN4: \
((BUN4type *) hs->Link)[p] = ((BUN4type *)
hs->Hash)[prb]; \
- ((BUN4type *) hs->Hash)[prb] = p; \
+ ((BUN4type *) hs->Hash)[prb] = (BUN4type) p; \
break; \
case BUN8: \
((BUN8type *) hs->Link)[p] = ((BUN8type *)
hs->Hash)[prb]; \
- ((BUN8type *) hs->Hash)[prb] = p; \
+ ((BUN8type *) hs->Hash)[prb] = (BUN8type) p; \
break; \
} \
} while (0)
@@ -317,11 +317,11 @@
switch (hs->width) { \
case BUN2: \
((BUN2type *) hs->Link)[p] = ((BUN2type *)
hs->Hash)[prb]; \
- ((BUN2type *) hs->Hash)[prb] = p; \
+ ((BUN2type *) hs->Hash)[prb] = (BUN2type) p; \
break; \
case BUN4: \
((BUN4type *) hs->Link)[p] = ((BUN4type *)
hs->Hash)[prb]; \
- ((BUN4type *) hs->Hash)[prb] = p; \
+ ((BUN4type *) hs->Hash)[prb] = (BUN4type) p; \
break; \
} \
} while (0)
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -94,16 +94,16 @@ HASHins(BAT *b, BUN i, const void *v)
switch (h->width) {
case BUN2:
((BUN2type *)h->Link)[i] = ((BUN2type
*)h->Hash)[(h->pieces - 1) * (h->mask + 1) + c];
- ((BUN2type *)h->Hash)[(h->pieces - 1) *
(h->mask + 1) + c] = i;
+ ((BUN2type *)h->Hash)[(h->pieces - 1) *
(h->mask + 1) + c] = (BUN2type) i;
break;
case BUN4:
((BUN4type *)h->Link)[i] = ((BUN4type
*)h->Hash)[(h->pieces - 1) * (h->mask + 1) + c];
- ((BUN4type *)h->Hash)[(h->pieces - 1) *
(h->mask + 1) + c] = i;
+ ((BUN4type *)h->Hash)[(h->pieces - 1) *
(h->mask + 1) + c] = (BUN4type) i;
break;
#ifdef BUN8
case BUN8:
((BUN8type *)h->Link)[i] = ((BUN8type
*)h->Hash)[(h->pieces - 1) * (h->mask + 1) + c];
- ((BUN8type *)h->Hash)[(h->pieces - 1) *
(h->mask + 1) + c] = i;
+ ((BUN8type *)h->Hash)[(h->pieces - 1) *
(h->mask + 1) + c] = (BUN8type) i;
break;
#endif
}
@@ -285,7 +285,7 @@ BATcheckhash(BAT *b)
while (start < end) { \
c = (BUN) mix_##TYPE(v[start]) & mask; \
links##N[start] = hashes##N[c]; \
- hashes##N[c] = start; \
+ hashes##N[c] = (BUN##N##type) start; \
start++; \
} \
} while (0)
@@ -300,7 +300,7 @@ BATcheckhash(BAT *b)
const void *v = BUNtail(bi, start); \
c = (*hashf)(v) & mask; \
links##N[start] = hashes##N[c]; \
- hashes##N[c] = start; \
+ hashes##N[c] = (BUN##N##type) start; \
start++; \
} \
} while (0)
diff --git a/gdk/gdk_unique.c b/gdk/gdk_unique.c
--- a/gdk/gdk_unique.c
+++ b/gdk/gdk_unique.c
@@ -383,16 +383,16 @@ BATsubunique(BAT *b, BAT *s)
switch (hs->width) {
case BUN2:
((BUN2type *) hs->Link)[p] = ((BUN2type
*) hs->Hash)[prb];
- ((BUN2type *) hs->Hash)[prb] = p;
+ ((BUN2type *) hs->Hash)[prb] =
(BUN2type) p;
break;
case BUN4:
((BUN4type *) hs->Link)[p] = ((BUN4type
*) hs->Hash)[prb];
- ((BUN4type *) hs->Hash)[prb] = p;
+ ((BUN4type *) hs->Hash)[prb] =
(BUN4type) p;
break;
#ifdef BUN8
case BUN8:
((BUN8type *) hs->Link)[p] = ((BUN8type
*) hs->Hash)[prb];
- ((BUN8type *) hs->Hash)[prb] = p;
+ ((BUN8type *) hs->Hash)[prb] =
(BUN8type) p;
break;
#endif
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
