Changeset: 24a679d8d195 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24a679d8d195
Modified Files:
NT/monetdb_config.h.in
buildtools/ChangeLog
configure.ag
gdk/gdk_atoms.c
gdk/gdk_batop.mx
gdk/gdk_rangejoin.mx
gdk/gdk_relop.mx
gdk/gdk_scanselect.mx
gdk/gdk_scanselect_defs.mx
gdk/gdk_scanselect_defs_bte.mx
gdk/gdk_scanselect_defs_dbl.mx
gdk/gdk_scanselect_defs_flt.mx
gdk/gdk_scanselect_defs_int.mx
gdk/gdk_scanselect_defs_lng.mx
gdk/gdk_scanselect_defs_sht.mx
gdk/gdk_search.mx
gdk/gdk_setop.mx
gdk/gdk_ssort.c
gdk/gdk_ssort_impl.h
Branch: default
Log Message:
Removed --enable-noexpand configure option.
diffs (truncated from 1302 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -679,42 +679,6 @@
/* Define if you do not want assertions */
/* #undef NDEBUG */
-/* Define if you don't want to expand the bat type */
-/* #undef NOEXPAND_BAT */
-
-/* Define if you don't want to expand the bit type */
-/* #undef NOEXPAND_BIT */
-
-/* Define if you don't want to expand the bte type */
-/* #undef NOEXPAND_BTE */
-
-/* Define if you don't want to expand the dbl type */
-/* #undef NOEXPAND_DBL */
-
-/* Define if you don't want to expand the flt type */
-/* #undef NOEXPAND_FLT */
-
-/* Define if you don't want to expand the int type */
-/* #undef NOEXPAND_INT */
-
-/* Define if you don't want to expand the lng type */
-/* #undef NOEXPAND_LNG */
-
-/* Define if you don't want to expand the oid type */
-/* #undef NOEXPAND_OID */
-
-/* Define if you don't want to expand the ptr type */
-/* #undef NOEXPAND_PTR */
-
-/* Define if you don't want to expand the sht type */
-/* #undef NOEXPAND_SHT */
-
-/* Define if you don't want to expand the str type */
-/* #undef NOEXPAND_STR */
-
-/* Define if you don't want to expand the wrd type */
-/* #undef NOEXPAND_WRD */
-
/* Name of package */
#define PACKAGE "MonetDB"
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,6 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Jul 16 2012 Sjoerd Mullender <sjo...@acm.org>
+- Removed --enable-noexpand configure option.
+
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -723,93 +723,6 @@ AC_ARG_WITH(anttranslatepath,
anttranslatepath="$withval")
AC_SUBST(anttranslatepath)
-dnl --enable-noexpand
-AC_ARG_ENABLE(noexpand,
- AS_HELP_STRING([--enable-noexpand],
- [do not expand the comma-separated list of GDK types given as
argument, or "all" if no expansion should be done (default=)]),
- enable_noexpand=$enableval,
- enable_noexpand=)
-
-AC_MSG_CHECKING([for --enable-noexpand])
-noexpand=
-case $enable_noexpand in
-bat|bat,*|*,bat|*,bat,*|all)
- AC_DEFINE(NOEXPAND_BAT, 1, [Define if you don't want to expand the bat
type])
- noexpand="$noexpand bat"
- ;;
-esac
-case $enable_noexpand in
-bit|bit,*|*,bit|*,bit,*|all)
- AC_DEFINE(NOEXPAND_BIT, 1, [Define if you don't want to expand the bit
type])
- noexpand="$noexpand bit"
- ;;
-esac
-case $enable_noexpand in
-bte|bte,*|*,bte|*,bte,*|all)
- AC_DEFINE(NOEXPAND_BTE, 1, [Define if you don't want to expand the bte
type])
- noexpand="$noexpand bte"
- ;;
-esac
-case $enable_noexpand in
-dbl|dbl,*|*,dbl|*,dbl,*|all)
- AC_DEFINE(NOEXPAND_DBL, 1, [Define if you don't want to expand the dbl
type])
- noexpand="$noexpand dbl"
- ;;
-esac
-case $enable_noexpand in
-flt|flt,*|*,flt|*,flt,*|all)
- AC_DEFINE(NOEXPAND_FLT, 1, [Define if you don't want to expand the flt
type])
- noexpand="$noexpand flt"
- ;;
-esac
-case $enable_noexpand in
-int|int,*|*,int|*,int,*|all)
- AC_DEFINE(NOEXPAND_INT, 1, [Define if you don't want to expand the int
type])
- noexpand="$noexpand int"
- ;;
-esac
-case $enable_noexpand in
-lng|lng,*|*,lng|*,lng,*|all)
- AC_DEFINE(NOEXPAND_LNG, 1, [Define if you don't want to expand the lng
type])
- noexpand="$noexpand lng"
- ;;
-esac
-case $enable_noexpand in
-oid|oid,*|*,oid|*,oid,*|all)
- AC_DEFINE(NOEXPAND_OID, 1, [Define if you don't want to expand the oid
type])
- noexpand="$noexpand oid"
- ;;
-esac
-case $enable_noexpand in
-ptr|ptr,*|*,ptr|*,ptr,*|all)
- AC_DEFINE(NOEXPAND_PTR, 1, [Define if you don't want to expand the ptr
type])
- noexpand="$noexpand ptr"
- ;;
-esac
-case $enable_noexpand in
-sht|sht,*|*,sht|*,sht,*|all)
- AC_DEFINE(NOEXPAND_SHT, 1, [Define if you don't want to expand the sht
type])
- noexpand="$noexpand sht"
- ;;
-esac
-case $enable_noexpand in
-str|str,*|*,str|*,str,*|all)
- AC_DEFINE(NOEXPAND_STR, 1, [Define if you don't want to expand the str
type])
- noexpand="$noexpand str"
- ;;
-esac
-case $enable_noexpand in
-wrd|wrd,*|*,wrd|*,wrd,*|all)
- AC_DEFINE(NOEXPAND_WRD, 1, [Define if you don't want to expand the wrd
type])
- noexpand="$noexpand wrd"
- ;;
-esac
-if test -z "$noexpand" ; then
- AC_MSG_RESULT([none])
-else
- AC_MSG_RESULT([$noexpand])
-fi
-
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
[enable full debugging (default=yes for development sources)]),
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -382,30 +382,18 @@ int
ATOMcmp(int t, const void *l, const void *r)
{
switch (ATOMstorage(t)) {
-#ifndef NOEXPAND_BTE
case TYPE_bte:
return simple_CMP(l, r, bte);
-#endif
-#ifndef NOEXPAND_SHT
case TYPE_sht:
return simple_CMP(l, r, sht);
-#endif
-#ifndef NOEXPAND_INT
case TYPE_int:
return simple_CMP(l, r, int);
-#endif
-#ifndef NOEXPAND_FLT
case TYPE_flt:
return simple_CMP(l, r, flt);
-#endif
-#ifndef NOEXPAND_LNG
case TYPE_lng:
return simple_CMP(l, r, lng);
-#endif
-#ifndef NOEXPAND_DBL
case TYPE_dbl:
return simple_CMP(l, r, dbl);
-#endif
default:
return (l == r) ? 0 : atom_CMP(l, r, t);
}
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -962,41 +962,27 @@ BATslice2(BAT *b, BUN l1, BUN h1, BUN l2
}
@= hashselect
switch(ATOMstorage(b->htype)) {
-#ifndef NOEXPAND_BTE
case TYPE_bte:
@:valselect(@1,_bte)@
break;
-#endif
-#ifndef NOEXPAND_SHT
case TYPE_sht:
@:valselect(@1,_sht)@
break;
-#endif
-#ifndef NOEXPAND_INT
case TYPE_int:
@:valselect(@1,_int)@
break;
-#endif
-#ifndef NOEXPAND_FLT
case TYPE_flt:
@:valselect(@1,_flt)@
break;
-#endif
-#ifndef NOEXPAND_DBL
case TYPE_dbl:
@:valselect(@1,_dbl)@
break;
-#endif
-#ifndef NOEXPAND_LNG
case TYPE_lng:
@:valselect(@1,_lng)@
break;
-#endif
-#ifndef NOEXPAND_STR
case TYPE_str:
@:stringselect(@1)@
break;
-#endif
default:
if (b->hvarsized) {
@:valselect(@1,var)@
@@ -1500,36 +1486,24 @@ BATrestrict(BAT *b, const void *hl, cons
m = mark;
i = mark;
switch (ATOMstorage(t = b->htype)) {
-#ifndef NOEXPAND_BTE
case TYPE_bte:
@:restrict1(simple,bte,loc)@
break;
-#endif
-#ifndef NOEXPAND_SHT
case TYPE_sht:
@:restrict1(simple,sht,loc)@
break;
-#endif
-#ifndef NOEXPAND_INT
case TYPE_int:
@:restrict1(simple,int,loc)@
break;
-#endif
-#ifndef NOEXPAND_FLT
case TYPE_flt:
@:restrict1(simple,flt,loc)@
break;
-#endif
-#ifndef NOEXPAND_DBL
case TYPE_dbl:
@:restrict1(simple,dbl,loc)@
break;
-#endif
-#ifndef NOEXPAND_LNG
case TYPE_lng:
@:restrict1(simple,lng,loc)@
break;
-#endif
default:
if (b->hvarsized) {
@:restrict1(atom,t,var)@
@@ -1542,36 +1516,24 @@ BATrestrict(BAT *b, const void *hl, cons
/* second phase */
if (b->hvarsized) {
switch (ATOMstorage(t = b->ttype)) {
-#ifndef NOEXPAND_BTE
case TYPE_bte:
@:restrict2(simple,bte,var,loc)@
break;
-#endif
-#ifndef NOEXPAND_SHT
case TYPE_sht:
@:restrict2(simple,sht,var,loc)@
break;
-#endif
-#ifndef NOEXPAND_INT
case TYPE_int:
@:restrict2(simple,int,var,loc)@
break;
-#endif
-#ifndef NOEXPAND_FLT
case TYPE_flt:
@:restrict2(simple,flt,var,loc)@
break;
-#endif
-#ifndef NOEXPAND_DBL
case TYPE_dbl:
@:restrict2(simple,dbl,var,loc)@
break;
-#endif
-#ifndef NOEXPAND_LNG
case TYPE_lng:
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
