J'ai encore des problemesavec small et mingw voici les patch que j'applique:
pour solve.cc
Code : Tout sélectionner
4916c4916
< index_t small,cur;
---
> index_t small0,cur;
4923c4923
< index_lcm(res[B[smallpos].first].coord.front().index,res[B[smallpos].second].coord.front().index,small);
---
> index_lcm(res[B[smallpos].first].coord.front().index,res[B[smallpos].second].coord.front().index,small0);
4930c4930
< || (curtd==smalltd && res.front().is_strictly_greater(small,cur))
---
> || (curtd==smalltd && res.front().is_strictly_greater(small0,cur))
4933c4933
< swap(small,cur); // small=cur;
---
> swap(small0,cur); // small0=cur;
et pour cocoa.cc
Code : Tout sélectionner
1228c1228
< bool small=env && env->moduloon && env->modulo.type==_INT_ && env->modulo.val;
---
> bool small0=env && env->moduloon && env->modulo.type==_INT_ && env->modulo.val;
1235c1235
< if (small)
---
> if (small0)
1255c1255
< if (small)
---
> if (small0)
1281c1281
< if (small){
---
> if (small0){
1755c1755
< bool small=env && env->moduloon && env->modulo.type==_INT_ && env->modulo.val;
---
> bool small0=env && env->moduloon && env->modulo.type==_INT_ && env->modulo.val;
1772c1772
< // if (small) TMP1.coord.push_back(*pt);
---
> // if (small0) TMP1.coord.push_back(*pt);
1776c1776
< if (small){
---
> if (small0){
1819c1819
< // if (small) swap(rem.coord,TMP1.coord);
---
> // if (small0) swap(rem.coord,TMP1.coord);
1858c1858
< // if (small) swap(p.coord,TMP1.coord);
---
> // if (small0) swap(p.coord,TMP1.coord);
1992c1992
< bool small=env && env->moduloon && env->modulo.type==_INT_ && env->modulo.val;
---
> bool small0=env && env->moduloon && env->modulo.type==_INT_ && env->modulo.val;
1998c1998
< if (small)
---
> if (small0)
2026c2026
< tdeg_t small,cur;
---
> tdeg_t small0,cur;
2034c2034
< index_lcm(res[B[smallpos].first].coord.front().u,res[B[smallpos].second].coord.front().u,small,order);
---
> index_lcm(res[B[smallpos].first].coord.front().u,res[B[smallpos].second].coord.front().u,small0,order);
2036c2036
< smallsugar=res[B[smallpos].first].sugar+(small-res[B[smallpos].first].coord.front().u).total_degree();
---
> smallsugar=res[B[smallpos].first].sugar+(small0-res[B[smallpos].first].coord.front().u).total_degree();
2047c2047
< doswap=tdeg_t_strictly_greater(small,cur,order);
---
> doswap=tdeg_t_strictly_greater(small0,cur,order);
2052c2052
< doswap=tdeg_t_strictly_greater(small,cur,order);
---
> doswap=tdeg_t_strictly_greater(small0,cur,order);
2056c2056
< swap(small,cur); // small=cur;
---
> swap(small0,cur); // small0=cur;
2759c2759
< // if (small) TMP1.coord.push_back(*pt);
---
> // if (small0) TMP1.coord.push_back(*pt);
2860c2860
< // if (small) swap(p.coord,TMP1.coord);
---
> // if (small0) swap(p.coord,TMP1.coord);
2887c2887
< // if (small) TMP1.coord.push_back(*pt);
---
> // if (small0) TMP1.coord.push_back(*pt);
3168c3168
< tdeg_t small,cur;
---
> tdeg_t small0,cur;
3176c3176
< index_lcm(res[B[smallpos].first].coord.front().u,res[B[smallpos].second].coord.front().u,small,order);
---
> index_lcm(res[B[smallpos].first].coord.front().u,res[B[smallpos].second].coord.front().u,small0,order);
3178c3178
< smallsugar=res[B[smallpos].first].sugar+(small-res[B[smallpos].first].coord.front().u).total_degree();
---
> smallsugar=res[B[smallpos].first].sugar+(small0-res[B[smallpos].first].coord.front().u).total_degree();
3189c3189
< doswap=tdeg_t_strictly_greater(small,cur,order);
---
> doswap=tdeg_t_strictly_greater(small0,cur,order);
3194c3194
< doswap=tdeg_t_strictly_greater(small,cur,order);
---
> doswap=tdeg_t_strictly_greater(small0,cur,order);
3198c3198
< swap(small,cur); // small=cur;
---
> swap(small0,cur); // small0=cur;
6259c6259
< tdeg_t small,cur;
---
> tdeg_t small0,cur;
6268,6270c6268,6270
< index_lcm(res[B[smallpos].first].coord.front().u,res[B[smallpos].second].coord.front().u,small,order);
< smallsugar=res[B[smallpos].first].sugar+(small-res[B[smallpos].first].coord.front().u).total_degree();
< smalltotdeg=small.total_degree();
---
> index_lcm(res[B[smallpos].first].coord.front().u,res[B[smallpos].second].coord.front().u,small0,order);
> smallsugar=res[B[smallpos].first].sugar+(small0-res[B[smallpos].first].coord.front().u).total_degree();
> smalltotdeg=small0.total_degree();
6282c6282
< doswap=tdeg_t_strictly_greater(small,cur,order);
---
> doswap=tdeg_t_strictly_greater(small0,cur,order);
6297c6297
< swap(small,cur); // small=cur;
---
> swap(small0,cur); // small0=cur;