MonetDB: default - Fix merge.

[Sjoerd Mullender]

Changeset: 8ce8461791be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ce8461791be
Modified Files:
        gdk/gdk_bat.c
        gdk/gdk_private.h
Branch: default
Log Message:

Fix merge.


diffs (61 lines):

diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -180,28 +180,6 @@ BATsetdims(BAT *b, uint16_t width)
 }
 
 const char *
-gettailnamebi(const BATiter *bi)
-{
-       if (bi->type == TYPE_str) {
-               switch (bi->width) {
-               case 1:
-                       return "tail1";
-               case 2:
-                       return "tail2";
-               case 4:
-#if SIZEOF_VAR_T == 8
-                       return "tail4";
-               case 8:
-#endif
-                       break;
-               default:
-                       MT_UNREACHABLE();
-               }
-       }
-       return "tail";
-}
-
-const char *
 gettailname(const BAT *b)
 {
        if (b->ttype == TYPE_str) {
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -256,8 +256,6 @@ gdk_return rangejoin(BAT *r1, BAT *r2, B
        __attribute__((__visibility__("hidden")));
 const char *gettailname(const BAT *b)
        __attribute__((__visibility__("hidden")));
-const char *gettailnamebi(const BATiter *bi)
-       __attribute__((__visibility__("hidden")));
 void settailname(Heap *restrict tail, const char *restrict physnme, int tt, 
int width)
        __attribute__((__visibility__("hidden")));
 void strCleanHash(Heap *hp, bool rebuild)
@@ -291,12 +289,14 @@ gettailnamebi(const BATiter *bi)
                        return "tail1";
                case 2:
                        return "tail2";
+               case 4:
 #if SIZEOF_VAR_T == 8
-               case 4:
                        return "tail4";
+               case 8:
 #endif
+                       break;
                default:
-                       break;
+                       MT_UNREACHABLE();
                }
        }
        return "tail";
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org