diff --git a/src/libbdelta.cpp b/src/libbdelta.cpp index b11bb2b..d769b0d 100644 --- a/src/libbdelta.cpp +++ b/src/libbdelta.cpp @@ -117,7 +117,3 @@ unsigned match_backward(BDelta_Instance *b, unsigned p1, unsigned p2, unsigned b // Iterator helper function -template -inline T prior(T i) {return --i;} -template -inline T next(T i) {return ++i;} - +template inline T bdelta_next(T i) {return ++i;} @@ -423,3 +419,3 @@ void bdelta_pass(BDelta_Instance *b, unsigned blocksize, unsigned minMatchSize, if (! maxHoleSize || (u1.num <= maxHoleSize && u2.num <= maxHoleSize)) - if (! (flags & BDELTA_SIDES_ORDERED) || (next(u1.ml) == u1.mr && next(u2.ml) == u2.mr)) + if (! (flags & BDELTA_SIDES_ORDERED) || (bdelta_next(u1.ml) == u1.mr && bdelta_next(u2.ml) == u2.mr)) bdelta_pass_2(b, blocksize, minMatchSize, &u1, 1, &u2, 1);