--- djview-4.8/src/qdjvuwidget.cpp~ 2011-08-17 16:24:20.000000000 +0200
+++ djview-4.8/src/qdjvuwidget.cpp 2011-10-03 20:48:49.000000000 +0200
@@ -153,7 +153,7 @@
}
template<class T> static inline void
-swap(T& x, T& y)
+swapper(T& x, T& y)
{
T tmp;
tmp = x;
@@ -173,11 +173,11 @@
/* Sort v[lo], v[m], v[hi] by insertion */
m = (lo+hi)/2;
if (v[lo]>v[m])
- swap(v[lo],v[m]);
+ swapper(v[lo],v[m]);
if (v[m]>v[hi]) {
- swap(v[m],v[hi]);
+ swapper(v[m],v[hi]);
if (v[lo]>v[m])
- swap(v[lo],v[m]);
+ swapper(v[lo],v[m]);
}
/* Extract pivot, place sentinel */
pivot = v[m];
@@ -191,7 +191,7 @@
do ++l; while (v[l]<pivot);
do --h; while (v[h]>pivot);
if (l < h) {
- swap(v[l],v[h]);
+ swapper(v[l],v[h]);
goto loop;
}
/* Finish up */