# # # patch "asciik.cc" # from [436973ab5066eeb3359b379e648b1fb43b50126b] # to [fb51227877ee84eeb285fc28a905a21830ac5b81] # ============================================================ --- asciik.cc 436973ab5066eeb3359b379e648b1fb43b50126b +++ asciik.cc fb51227877ee84eeb285fc28a905a21830ac5b81 @@ -143,7 +143,6 @@ using std::distance; using std::find; using std::reverse; using std::distance; -using std::abs; static revision_id ghost; // valid but empty revision_id to be used as ghost value @@ -294,7 +293,7 @@ asciik::try_draw(vector con if (found != next_row.end()) { size_t j = distance(next_row.begin(), found); - size_t d = abs(i - j); + size_t d = i>j ? i-j : j-i; if (d > 1) return false; if (d != 0) @@ -313,7 +312,7 @@ asciik::try_draw(vector con size_t j = distance(next_row.begin(), find(next_row.begin(), next_row.end(), *p)); I(j < next_items); - size_t d = abs(i - j); + size_t d = i>j ? i-j : j-i; if ((d > 1) && have_shift) return false; parent_links.insert(pair(i, j));