isl_pw_templ.c: rename align_params_pw_pw_and to include PW

This allows isl_pw_templ.c to be included twice from the same file.

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

diff --git a/isl_aff.c b/isl_aff.c
index c18493d..3379d01 100644 (file)
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -1330,7 +1330,8 @@ static __isl_give isl_pw_aff *pw_aff_union_max(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_union_max(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
-       return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_union_max);
+       return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2,
+                                                       &pw_aff_union_max);
 }
 
 /* Compute a piecewise quasi-affine expression with a domain that
@@ -1348,7 +1349,8 @@ static __isl_give isl_pw_aff *pw_aff_union_min(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_union_min(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
-       return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_union_min);
+       return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2,
+                                                       &pw_aff_union_min);
 }
 
 __isl_give isl_pw_aff *isl_pw_aff_union_opt(__isl_take isl_pw_aff *pwaff1,
@@ -1852,7 +1854,7 @@ error:
 __isl_give isl_pw_aff *isl_pw_aff_mul(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
-       return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_mul);
+       return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_mul);
 }
 
 static __isl_give isl_pw_aff *pw_aff_min(__isl_take isl_pw_aff *pwaff1,
@@ -1868,7 +1870,7 @@ static __isl_give isl_pw_aff *pw_aff_min(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_min(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
-       return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_min);
+       return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_min);
 }
 
 static __isl_give isl_pw_aff *pw_aff_max(__isl_take isl_pw_aff *pwaff1,
@@ -1884,7 +1886,7 @@ static __isl_give isl_pw_aff *pw_aff_max(__isl_take isl_pw_aff *pwaff1,
 __isl_give isl_pw_aff *isl_pw_aff_max(__isl_take isl_pw_aff *pwaff1,
        __isl_take isl_pw_aff *pwaff2)
 {
-       return align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_max);
+       return isl_pw_aff_align_params_pw_pw_and(pwaff1, pwaff2, &pw_aff_max);
 }
 
 static __isl_give isl_pw_aff *pw_aff_list_reduce(

diff --git a/isl_pw_templ.c b/isl_pw_templ.c
index f34be2a..c1200b9 100644 (file)
--- a/isl_pw_templ.c
+++ b/isl_pw_templ.c
@@ -249,7 +249,7 @@ error:
        return NULL;
 }
 
-static __isl_give PW *align_params_pw_pw_and(__isl_take PW *pw1,
+static __isl_give PW *FN(PW,align_params_pw_pw_and)(__isl_take PW *pw1,
        __isl_take PW *pw2,
        __isl_give PW *(*fn)(__isl_take PW *pw1, __isl_take PW *pw2))
 {
@@ -273,7 +273,7 @@ error:
        return NULL;
 }
 
-static __isl_give PW *align_params_pw_set_and(__isl_take PW *pw,
+static __isl_give PW *FN(PW,align_params_pw_set_and)(__isl_take PW *pw,
        __isl_take isl_set *set,
        __isl_give PW *(*fn)(__isl_take PW *pw, __isl_take isl_set *set))
 {
@@ -376,7 +376,7 @@ error:
 
 __isl_give PW *FN(PW,add)(__isl_take PW *pw1, __isl_take PW *pw2)
 {
-       return align_params_pw_pw_and(pw1, pw2, &FN(PW,add_aligned));
+       return FN(PW,align_params_pw_pw_and)(pw1, pw2, &FN(PW,add_aligned));
 }
 
 /* Make sure "pw" has room for at least "n" more pieces.
@@ -468,7 +468,8 @@ error:
 
 __isl_give PW *FN(PW,add_disjoint)(__isl_take PW *pw1, __isl_take PW *pw2)
 {
-       return align_params_pw_pw_and(pw1, pw2, &FN(PW,add_disjoint_aligned));
+       return FN(PW,align_params_pw_pw_and)(pw1, pw2,
+                                               &FN(PW,add_disjoint_aligned));
 }
 
 #ifndef NO_NEG
@@ -603,7 +604,7 @@ error:
 __isl_give PW *FN(PW,intersect_domain)(__isl_take PW *pw,
        __isl_take isl_set *context)
 {
-       return align_params_pw_set_and(pw, context,
+       return FN(PW,align_params_pw_set_and)(pw, context,
                                        &FN(PW,intersect_domain_aligned));
 }
 
@@ -667,7 +668,7 @@ error:
 
 __isl_give PW *FN(PW,gist)(__isl_take PW *pw, __isl_take isl_set *context)
 {
-       return align_params_pw_set_and(pw, context, &FN(PW,gist_aligned));
+       return FN(PW,align_params_pw_set_and)(pw, context, &FN(PW,gist_aligned));
 }
 
 __isl_give PW *FN(PW,coalesce)(__isl_take PW *pw)