MonetDB: default - Don't evaluate macro argument multiple times.

[Sjoerd Mullender]

Changeset: a4055c0e7fc4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4055c0e7fc4
Modified Files:
        gdk/gdk.h
Branch: default
Log Message:

Don't evaluate macro argument multiple times.


diffs (65 lines):

diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3380,7 +3380,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        "#BATselect_([%s,%s]) %s[%s:%d]\n",             \
                        _COL_TYPE(_b->H), _COL_TYPE(_b->T),             \
                        __func__, __FILE__, __LINE__);                  \
-               BATselect_((b), (h), (t), (li), (hi));                  \
+               BATselect_(_b, (h), (t), (li), (hi));                   \
        })
 
 #define BATuselect_(b, h, t, li, hi)                                   \
@@ -3390,7 +3390,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        "#BATuselect_([%s,%s]) %s[%s:%d]\n",            \
                        _COL_TYPE(_b->H), _COL_TYPE(_b->T),             \
                        __func__, __FILE__, __LINE__);                  \
-               BATuselect_((b), (h), (t), (li), (hi));                 \
+               BATuselect_(_b, (h), (t), (li), (hi));                  \
        })
 
 #define BATantiuselect_(b, h, t, li, hi)                               \
@@ -3400,7 +3400,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        "#BATantiuselect_([%s,%s]) %s[%s:%d]\n",        \
                        _COL_TYPE(_b->H), _COL_TYPE(_b->T),             \
                        __func__, __FILE__, __LINE__);                  \
-               BATantiuselect_((b), (h), (t), (li), (hi));             \
+               BATantiuselect_(_b, (h), (t), (li), (hi));              \
        })
 
 #define BATselect(b, h, t)                                             \
@@ -3410,7 +3410,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        "#BATselect([%s,%s]) %s[%s:%d]\n",              \
                        _COL_TYPE(_b->H), _COL_TYPE(_b->T),             \
                        __func__, __FILE__, __LINE__);                  \
-               BATselect((b), (h), (t));                               \
+               BATselect(_b, (h), (t));                                \
        })
 
 #define BATuselect(b, h, t)                                            \
@@ -3420,7 +3420,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        "#BATuselect([%s,%s]) %s[%s:%d]\n",             \
                        _COL_TYPE(_b->H), _COL_TYPE(_b->T),             \
                        __func__, __FILE__, __LINE__);                  \
-               BATuselect((b), (h), (t));                              \
+               BATuselect(_b, (h), (t));                               \
        })
 
 #define BATsample(b, n)                                                        
\
@@ -3430,7 +3430,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        "#BATsample([%s,%s]) %s[%s:%d]\n",              \
                        _COL_TYPE(_b->H), _COL_TYPE(_b->T),             \
                        __func__, __FILE__, __LINE__);                  \
-               BATsample((b), (n));                                    \
+               BATsample(_b, (n));                                     \
        })
 
 #define BATsemijoin(l, r)                                              \
@@ -3532,6 +3532,7 @@ gdk_export BAT *BATsample_(BAT *b, BUN n
                        __func__, __FILE__, __LINE__);                  \
                BATrangejoin(_l, _rl, _rh, (li), (hi));                 \
        })
+
 #endif
 #endif
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list