Merge branch 'maint'
authorSven Verdoolaege <sven.verdoolaege@gmail.com>
Fri, 14 Dec 2018 17:23:22 +0000 (14 18:23 +0100)
committerSven Verdoolaege <sven.verdoolaege@gmail.com>
Fri, 14 Dec 2018 17:23:22 +0000 (14 18:23 +0100)
1  2 
isl_coalesce.c
isl_test.c

diff --cc isl_coalesce.c
@@@ -1470,12 -1489,10 +1509,13 @@@ static isl_stat add_wraps_around_facet(
        struct isl_coalesce_info *info, int k, isl_int *bound,
        __isl_keep isl_set *set)
  {
+       isl_bool nowrap;
        struct isl_tab_undo *snap;
        int n;
 -      unsigned total = isl_basic_map_total_dim(info->bmap);
 +      isl_size total = isl_basic_map_dim(info->bmap, isl_dim_all);
 +
 +      if (total < 0)
 +              return isl_stat_error;
  
        snap = isl_tab_snap(info->tab);
  
diff --cc isl_test.c
Simple merge