rename isl_basic_set_sample to isl_basic_set_sample_vec

diff --git a/include/isl_map.h b/include/isl_map.h
index e89f611..3328616 100644 (file)
--- a/include/isl_map.h
+++ b/include/isl_map.h
@@ -7,6 +7,7 @@
 #include <isl_ctx.h>
 #include <isl_blk.h>
 #include <isl_dim.h>
+#include <isl_vec.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -34,7 +35,6 @@ extern "C" {
  * n_out is the number of out variables
  * n_in + n_out should be equal to set.dim
  */
-struct isl_vec;
 struct isl_dim;
 struct isl_basic_map {
        int ref;

diff --git a/include/isl_vec.h b/include/isl_vec.h
index 00d58ed..796ce2b 100644 (file)
--- a/include/isl_vec.h
+++ b/include/isl_vec.h
@@ -21,6 +21,7 @@ struct isl_vec {
 
        struct isl_blk block;
 };
+typedef struct isl_vec isl_vec;
 
 struct isl_vec *isl_vec_alloc(struct isl_ctx *ctx, unsigned size);
 struct isl_vec *isl_vec_copy(struct isl_vec *vec);

diff --git a/isl_affine_hull.c b/isl_affine_hull.c
index 6ae3e17..11522bc 100644 (file)
--- a/isl_affine_hull.c
+++ b/isl_affine_hull.c
@@ -531,7 +531,7 @@ static struct isl_basic_set *uset_affine_hull(struct isl_basic_set *bset)
        if (isl_basic_set_is_empty(bset))
                return bset;
 
-       sample = isl_basic_set_sample(isl_basic_set_copy(bset));
+       sample = isl_basic_set_sample_vec(isl_basic_set_copy(bset));
        if (!sample)
                goto error;
        if (sample->size == 0) {

diff --git a/isl_ilp.c b/isl_ilp.c
index 0fe7f23..67e734f 100644 (file)
--- a/isl_ilp.c
+++ b/isl_ilp.c
@@ -78,7 +78,7 @@ static struct isl_vec *initial_solution(struct isl_basic_set *bset, isl_int *f)
 
        isl_basic_set_free(unit_box);
 
-       return isl_basic_set_sample(isl_basic_set_copy(bset));
+       return isl_basic_set_sample_vec(isl_basic_set_copy(bset));
 }
 
 /* Restrict "bset" to those points with values for f in the interval [l, u].
@@ -187,7 +187,7 @@ static enum isl_lp_result solve_ilp(struct isl_basic_set *bset,
                        isl_int_add(tmp, tmp, l);
                }
                slice = add_bounds(isl_basic_set_copy(bset), f, l, tmp);
-               sample = isl_basic_set_sample(slice);
+               sample = isl_basic_set_sample_vec(slice);
                if (!sample) {
                        isl_vec_free(sol);
                        sol = NULL;

diff --git a/isl_map.c b/isl_map.c
index d884231..0562220 100644 (file)
--- a/isl_map.c
+++ b/isl_map.c
@@ -4077,7 +4077,7 @@ int isl_basic_map_is_empty(struct isl_basic_map *bmap)
        bset = isl_basic_map_underlying_set(isl_basic_map_copy(bmap));
        if (!bset)
                return -1;
-       sample = isl_basic_set_sample(bset);
+       sample = isl_basic_set_sample_vec(bset);
        if (!sample)
                return -1;
        empty = sample->size == 0;

diff --git a/isl_sample.c b/isl_sample.c
index ce8337b..1d3b296 100644 (file)
--- a/isl_sample.c
+++ b/isl_sample.c
@@ -909,7 +909,7 @@ static struct isl_vec *basic_set_sample(struct isl_basic_set *bset, int bounded)
        bset->sample = NULL;
 
        if (bset->n_eq > 0)
-               return sample_eq(bset, isl_basic_set_sample);
+               return sample_eq(bset, isl_basic_set_sample_vec);
        if (dim == 0)
                return zero_sample(bset);
        if (dim == 1)
@@ -927,7 +927,7 @@ error:
        return NULL;
 }
 
-struct isl_vec *isl_basic_set_sample(struct isl_basic_set *bset)
+__isl_give isl_vec *isl_basic_set_sample_vec(__isl_take isl_basic_set *bset)
 {
        return basic_set_sample(bset, 0);
 }

diff --git a/isl_sample.h b/isl_sample.h
index 891350a..19b899f 100644 (file)
--- a/isl_sample.h
+++ b/isl_sample.h
@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-struct isl_vec *isl_basic_set_sample(struct isl_basic_set *bset);
+__isl_give isl_vec *isl_basic_set_sample_vec(__isl_take isl_basic_set *bset);
 struct isl_vec *isl_basic_set_sample_bounded(struct isl_basic_set *bset);
 
 #if defined(__cplusplus)

diff --git a/polyhedron_sample.c b/polyhedron_sample.c
index 05e0875..12b5380 100644 (file)
--- a/polyhedron_sample.c
+++ b/polyhedron_sample.c
@@ -10,7 +10,7 @@ int main(int argc, char **argv)
        struct isl_vec *sample;
 
        bset = isl_basic_set_read_from_file(ctx, stdin, 0, ISL_FORMAT_POLYLIB);
-       sample = isl_basic_set_sample(isl_basic_set_copy(bset));
+       sample = isl_basic_set_sample_vec(isl_basic_set_copy(bset));
        isl_vec_dump(sample, stdout, 0);
        assert(sample);
        if (sample->size > 0)