Changeset: 0203ccea7029 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0203ccea7029
Modified Files:
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_group.c
Branch: default
Log Message:
Removed TYPE_var.
diffs (65 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -582,11 +582,9 @@ typedef oid var_t; /* type used for hea
#define SIZEOF_VAR_T SIZEOF_OID
#define VARFMT OIDFMT
-#if SIZEOF_VAR_T == SIZEOF_INT /* a type compatible with var_t */
-#define TYPE_var TYPE_int
+#if SIZEOF_VAR_T == SIZEOF_INT
#define VAR_MAX ((var_t) INT_MAX)
#else
-#define TYPE_var TYPE_lng
#define VAR_MAX ((var_t) LLONG_MAX)
#endif
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -189,16 +189,18 @@ insert_string_bat(BAT *b, BAT *n, int fo
tt = TYPE_sht;
tp = &tsv;
break;
-#if SIZEOF_VAR_T == 8
case 4:
tt = TYPE_int;
tp = &tiv;
break;
+#if SIZEOF_VAR_T == 8
+ case 8:
+ tt = TYPE_lng;
+ tp = &v;
+ break;
#endif
default:
- tt = TYPE_var;
- tp = &v;
- break;
+ assert(0);
}
b->tvarsized = 0;
b->ttype = tt;
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -560,14 +560,16 @@ BATgroup_internal(BAT **groups, BAT **ex
case 2:
t = TYPE_sht;
break;
-#if SIZEOF_VAR_T == 8
case 4:
t = TYPE_int;
break;
+#if SIZEOF_VAR_T == 8
+ case 8:
+ t = TYPE_lng;
+ break;
#endif
default:
- t = TYPE_var;
- break;
+ assert(0);
}
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
