Changeset: 3297f449b30a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3297f449b30a
Modified Files:
        clients/Tests/exports.stable.out
        gdk/gdk.h
        gdk/gdk_atoms.c
Branch: default
Log Message:

Dead code removal.


diffs (64 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -461,8 +461,6 @@ void VIEWbounds(BAT *b, BAT *view, BUN l
 BAT *VIEWcreate(oid seq, BAT *b, BUN l, BUN h);
 size_t _MT_npages;
 size_t _MT_pagesize;
-const union _dbl_nil_t _dbl_nil_;
-const union _flt_nil_t _flt_nil_;
 char *asctime_r(const struct tm *restrict, char *restrict);
 double bat_guess_uniques(BAT *b, BATiter *bi, struct canditer *bci);
 ssize_t bitFromStr(allocator *ma, const char *src, size_t *len, bit **dst, 
bool external);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1888,25 +1888,8 @@ gdk_export size_t escapedStr(char *restr
 gdk_export const bte bte_nil;
 gdk_export const sht sht_nil;
 gdk_export const int int_nil;
-#ifdef NAN_CANNOT_BE_USED_AS_INITIALIZER
-/* Definition of NAN is seriously broken on Intel compiler (at least
- * in some versions), so we work around it. */
-union _flt_nil_t {
-       uint32_t l;
-       flt f;
-};
-gdk_export const union _flt_nil_t _flt_nil_;
-#define flt_nil (_flt_nil_.f)
-union _dbl_nil_t {
-       uint64_t l;
-       dbl d;
-};
-gdk_export const union _dbl_nil_t _dbl_nil_;
-#define dbl_nil (_dbl_nil_.d)
-#else
 gdk_export const flt flt_nil;
 gdk_export const dbl dbl_nil;
-#endif
 gdk_export const lng lng_nil;
 #ifdef HAVE_HGE
 gdk_export const hge hge_nil;
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -258,19 +258,8 @@ ATOMisdescendant(int tpe, int parent)
 const bte bte_nil = GDK_bte_min-1;
 const sht sht_nil = GDK_sht_min-1;
 const int int_nil = GDK_int_min-1;
-#ifdef NAN_CANNOT_BE_USED_AS_INITIALIZER
-/* Definition of NAN is seriously broken on Intel compiler (at least
- * in some versions), so we work around it. */
-const union _flt_nil_t _flt_nil_ = {
-       .l = UINT32_C(0x7FC00000)
-};
-const union _dbl_nil_t _dbl_nil_ = {
-       .l = UINT64_C(0x7FF8000000000000)
-};
-#else
 const flt flt_nil = NAN;
 const dbl dbl_nil = NAN;
-#endif
 const lng lng_nil = GDK_lng_min-1;
 #ifdef HAVE_HGE
 const hge hge_nil = GDK_hge_min-1;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to