MonetDB: strimps-updates - removed need for encountered boolean

[Niels Nes via checkin-list]

Changeset: b33cd1219b8d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b33cd1219b8d
Modified Files:
        gdk/gdk_strimps.c
        gdk/gdk_strimps.h
Branch: strimps-updates
Log Message:

removed need for encountered boolean


diffs (36 lines):

diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -297,7 +297,6 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
        }
 
        for(hidx = 0; hidx < hlen; hidx++) {
-               hist[hidx].encountered = false;
                hist[hidx].cnt = 0;
                hist[hidx].mask = 0;
                hist[hidx].idx = hidx;
@@ -342,11 +341,9 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
                                                continue;
                                        }
 #endif
-                                       hist[hidx].cnt++;
-                                       if (!hist[hidx].encountered) {
+                                       if (!hist[hidx].cnt)
                                                values++;
-                                               hist[hidx].encountered = true;
-                                       }
+                                       hist[hidx].cnt++;
                                }
                                next_pair(pip);
                        }
diff --git a/gdk/gdk_strimps.h b/gdk/gdk_strimps.h
--- a/gdk/gdk_strimps.h
+++ b/gdk/gdk_strimps.h
@@ -34,7 +34,6 @@ typedef struct {
 } PairIterator;
 
 typedef struct {
-       bool encountered;
        uint64_t cnt;
        uint64_t mask;
        size_t idx;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org