From 7f72677722dcde9b795085c74bdbc40b996cc6c2 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Tue, 16 Aug 2011 10:57:03 +0200 Subject: [PATCH] rename PW_alloc_ to PW_alloc_size Signed-off-by: Sven Verdoolaege --- isl_aff.c | 4 ++-- isl_fold.c | 6 +++--- isl_polynomial.c | 5 +++-- isl_pw_templ.c | 24 ++++++++++++------------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/isl_aff.c b/isl_aff.c index f17772e..b2a7189 100644 --- a/isl_aff.c +++ b/isl_aff.c @@ -1181,7 +1181,7 @@ static __isl_give isl_pw_aff *pw_aff_union_opt(__isl_take isl_pw_aff *pwaff1, } n = 2 * (pwaff1->n + 1) * (pwaff2->n + 1); - res = isl_pw_aff_alloc_(isl_space_copy(pwaff1->dim), n); + res = isl_pw_aff_alloc_size(isl_space_copy(pwaff1->dim), n); for (i = 0; i < pwaff1->n; ++i) { set = isl_set_copy(pwaff1->p[i].set); @@ -1709,7 +1709,7 @@ static __isl_give isl_pw_aff *pw_aff_mul(__isl_take isl_pw_aff *pwaff1, goto error; n = pwaff1->n * pwaff2->n; - res = isl_pw_aff_alloc_(isl_space_copy(pwaff1->dim), n); + res = isl_pw_aff_alloc_size(isl_space_copy(pwaff1->dim), n); for (i = 0; i < pwaff1->n; ++i) { for (j = 0; j < pwaff2->n; ++j) { diff --git a/isl_fold.c b/isl_fold.c index 70ccbc3..80a6cbb 100644 --- a/isl_fold.c +++ b/isl_fold.c @@ -793,7 +793,7 @@ __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_fold( "fold types don't match", goto error); n = (pw1->n + 1) * (pw2->n + 1); - res = isl_pw_qpolynomial_fold_alloc_(isl_space_copy(pw1->dim), + res = isl_pw_qpolynomial_fold_alloc_size(isl_space_copy(pw1->dim), pw1->type, n); for (i = 0; i < pw1->n; ++i) { @@ -917,8 +917,8 @@ __isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_from_pw_qpolynomial( if (!pwqp) return NULL; - pwf = isl_pw_qpolynomial_fold_alloc_(isl_space_copy(pwqp->dim), type, - pwqp->n); + pwf = isl_pw_qpolynomial_fold_alloc_size(isl_space_copy(pwqp->dim), + type, pwqp->n); for (i = 0; i < pwqp->n; ++i) pwf = isl_pw_qpolynomial_fold_add_piece(pwf, diff --git a/isl_polynomial.c b/isl_polynomial.c index c83dc72..1597a63 100644 --- a/isl_polynomial.c +++ b/isl_polynomial.c @@ -2634,7 +2634,7 @@ __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_mul( } n = pwqp1->n * pwqp2->n; - res = isl_pw_qpolynomial_alloc_(isl_space_copy(pwqp1->dim), n); + res = isl_pw_qpolynomial_alloc_size(isl_space_copy(pwqp1->dim), n); for (i = 0; i < pwqp1->n; ++i) { for (j = 0; j < pwqp2->n; ++j) { @@ -3042,7 +3042,8 @@ __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_from_pw_aff( if (!pwaff) return NULL; - pwqp = isl_pw_qpolynomial_alloc_(isl_pw_aff_get_space(pwaff), pwaff->n); + pwqp = isl_pw_qpolynomial_alloc_size(isl_pw_aff_get_space(pwaff), + pwaff->n); for (i = 0; i < pwaff->n; ++i) { isl_set *dom; diff --git a/isl_pw_templ.c b/isl_pw_templ.c index 55d5903..281c2c1 100644 --- a/isl_pw_templ.c +++ b/isl_pw_templ.c @@ -4,10 +4,10 @@ #define S(TYPE,NAME) xS(TYPE,NAME) #ifdef HAS_TYPE -static __isl_give PW *FN(PW,alloc_)(__isl_take isl_space *dim, +__isl_give PW *FN(PW,alloc_size)(__isl_take isl_space *dim, enum isl_fold type, int n) #else -static __isl_give PW *FN(PW,alloc_)(__isl_take isl_space *dim, int n) +__isl_give PW *FN(PW,alloc_size)(__isl_take isl_space *dim, int n) #endif { isl_ctx *ctx; @@ -38,12 +38,12 @@ error: #ifdef HAS_TYPE __isl_give PW *FN(PW,ZERO)(__isl_take isl_space *dim, enum isl_fold type) { - return FN(PW,alloc_)(dim, type, 0); + return FN(PW,alloc_size)(dim, type, 0); } #else __isl_give PW *FN(PW,ZERO)(__isl_take isl_space *dim) { - return FN(PW,alloc_)(dim, 0); + return FN(PW,alloc_size)(dim, 0); } #endif @@ -99,9 +99,9 @@ __isl_give PW *FN(PW,alloc)(__isl_take isl_set *set, __isl_take EL *el) goto error; #ifdef HAS_TYPE - pw = FN(PW,alloc_)(isl_set_get_space(set), type, 1); + pw = FN(PW,alloc_size)(isl_set_get_space(set), type, 1); #else - pw = FN(PW,alloc_)(isl_set_get_space(set), 1); + pw = FN(PW,alloc_size)(isl_set_get_space(set), 1); #endif return FN(PW,add_piece)(pw, set, el); @@ -120,9 +120,9 @@ __isl_give PW *FN(PW,dup)(__isl_keep PW *pw) return NULL; #ifdef HAS_TYPE - dup = FN(PW,alloc_)(isl_space_copy(pw->dim), pw->type, pw->n); + dup = FN(PW,alloc_size)(isl_space_copy(pw->dim), pw->type, pw->n); #else - dup = FN(PW,alloc_)(isl_space_copy(pw->dim), pw->n); + dup = FN(PW,alloc_size)(isl_space_copy(pw->dim), pw->n); #endif if (!dup) return NULL; @@ -326,9 +326,9 @@ static __isl_give PW *FN(PW,add_aligned)(__isl_take PW *pw1, __isl_take PW *pw2) n = (pw1->n + 1) * (pw2->n + 1); #ifdef HAS_TYPE - res = FN(PW,alloc_)(isl_space_copy(pw1->dim), pw1->type, n); + res = FN(PW,alloc_size)(isl_space_copy(pw1->dim), pw1->type, n); #else - res = FN(PW,alloc_)(isl_space_copy(pw1->dim), n); + res = FN(PW,alloc_size)(isl_space_copy(pw1->dim), n); #endif for (i = 0; i < pw1->n; ++i) { @@ -403,9 +403,9 @@ static __isl_give PW *FN(PW,grow)(__isl_take PW *pw, int n) return res; } #ifdef HAS_TYPE - res = FN(PW,alloc_)(isl_space_copy(pw->dim), pw->type, n); + res = FN(PW,alloc_size)(isl_space_copy(pw->dim), pw->type, n); #else - res = FN(PW,alloc_)(isl_space_copy(pw->dim), n); + res = FN(PW,alloc_size)(isl_space_copy(pw->dim), n); #endif if (!res) return FN(PW,free)(pw); -- 2.7.4