Merge branch 'maint'

[platform/upstream/isl.git] / isl_union_templ.c

diff --git a/isl_union_templ.c b/isl_union_templ.c
index 0737a58..c06069d 100644 (file)
--- a/isl_union_templ.c
+++ b/isl_union_templ.c
@@ -279,7 +279,6 @@ static int align_entry(__isl_take PART *part, void *user)
 __isl_give UNION *FN(UNION,align_params)(__isl_take UNION *u,
        __isl_take isl_dim *model)
 {
-       int i, j;
        S(UNION,align) data = { NULL, NULL };
 
        if (!u || !model)
@@ -363,6 +362,12 @@ S(UNION,match_bin_data) {
        UNION *res;
 };
 
+/* This function is currently only used from isl_polynomial.c
+ * and not from isl_fold.c.
+ */
+static __isl_give UNION *match_bin_op(__isl_take UNION *u1,
+       __isl_take UNION *u2,
+       int (*fn)(void **, void *)) __attribute__ ((unused));
 static __isl_give UNION *match_bin_op(__isl_take UNION *u1,
        __isl_take UNION *u2, int (*fn)(void **, void *))
 {
@@ -412,7 +417,6 @@ static int match_set_entry(void **entry, void *user)
        S(UNION,match_set_data) *data = user;
        uint32_t hash;
        struct isl_hash_table_entry *entry2;
-       isl_dim *dim;
        PW *pw = *entry;
        int empty;