remove isl_union_map_copy_map

It was introduced in d4a684c (add isl_union_map_copy_map,
Fri Apr 8 09:47:04 2011 +0200) but left undocumented
and it was mainly intended to extract an isl_map from
isl_union_map lying in a single space, i.e., exactly
what the newly introduced isl_map_from_union_map does.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

diff --git a/include/isl/union_map.h b/include/isl/union_map.h
index a3344e7..5f61d0a 100644 (file)
--- a/include/isl/union_map.h
+++ b/include/isl/union_map.h
@@ -107,7 +107,6 @@ __isl_give int isl_union_map_contains(__isl_keep isl_union_map *umap,
        __isl_keep isl_dim *dim);
 __isl_give isl_map *isl_union_map_extract_map(__isl_keep isl_union_map *umap,
        __isl_take isl_dim *dim);
-__isl_give isl_map *isl_union_map_copy_map(__isl_keep isl_union_map *umap);
 __isl_give isl_map *isl_map_from_union_map(__isl_take isl_union_map *umap);
 
 __isl_give isl_basic_map *isl_union_map_sample(__isl_take isl_union_map *umap);

diff --git a/include/isl/union_set.h b/include/isl/union_set.h
index 563731a..3401f4e 100644 (file)
--- a/include/isl/union_set.h
+++ b/include/isl/union_set.h
@@ -66,7 +66,6 @@ __isl_give int isl_union_set_contains(__isl_keep isl_union_set *uset,
        __isl_keep isl_dim *dim);
 __isl_give isl_set *isl_union_set_extract_set(__isl_keep isl_union_set *uset,
        __isl_take isl_dim *dim);
-__isl_give isl_set *isl_union_set_copy_set(__isl_keep isl_union_set *uset);
 __isl_give isl_set *isl_set_from_union_set(__isl_take isl_union_set *uset);
 int isl_union_set_foreach_point(__isl_keep isl_union_set *uset,
        int (*fn)(__isl_take isl_point *pnt, void *user), void *user);

diff --git a/isl_test.c b/isl_test.c
index 610e67c..d8248a3 100644 (file)
--- a/isl_test.c
+++ b/isl_test.c
@@ -1920,8 +1920,9 @@ int test_one_schedule(isl_ctx *ctx, const char *d, const char *w,
                is_tilable = 1;
                is_parallel = 1;
                is_nonneg = 1;
+               isl_union_set_free(delta);
        } else {
-               delta_set = isl_union_set_copy_set(delta);
+               delta_set = isl_set_from_union_set(delta);
 
                slice = isl_set_universe(isl_set_get_dim(delta_set));
                for (i = 0; i < tilable; ++i)
@@ -1947,7 +1948,6 @@ int test_one_schedule(isl_ctx *ctx, const char *d, const char *w,
                isl_set_free(origin);
                isl_set_free(delta_set);
        }
-       isl_union_set_free(delta);
 
        if (is_nonneg < 0 || is_parallel < 0 || is_tilable < 0 ||
            is_injection < 0 || is_complete < 0)

diff --git a/isl_union_map.c b/isl_union_map.c
index 206e41b..a5910fb 100644 (file)
--- a/isl_union_map.c
+++ b/isl_union_map.c
@@ -370,23 +370,6 @@ static int copy_map(void **entry, void *user)
        return -1;
 }
 
-__isl_give isl_map *isl_union_map_copy_map(__isl_keep isl_union_map *umap)
-{
-       isl_map *map = NULL;
-
-       if (!umap || umap->table.n == 0)
-               return NULL;
-
-       isl_hash_table_foreach(umap->dim->ctx, &umap->table, &copy_map, &map);
-
-       return map;
-}
-
-__isl_give isl_set *isl_union_set_copy_set(__isl_keep isl_union_set *uset)
-{
-       return isl_union_map_copy_map(uset);
-}
-
 __isl_give isl_map *isl_map_from_union_map(__isl_take isl_union_map *umap)
 {
        isl_ctx *ctx;
@@ -1677,7 +1660,9 @@ int isl_union_map_is_single_valued(__isl_keep isl_union_map *umap)
        int sv;
 
        if (isl_union_map_n_map(umap) == 1) {
-               isl_map *map = isl_union_map_copy_map(umap);
+               isl_map *map;
+               umap = isl_union_map_copy(umap);
+               map = isl_map_from_union_map(umap);
                sv = isl_map_is_single_valued(map);
                isl_map_free(map);
                return sv;