packages: djview4/djview4-swap.patch (NEW)=?UTF-8?Q?=20?=- fix for ambiguous call to swap...
draenog
draenog at pld-linux.org
Fri Feb 17 12:23:13 CET 2012
Author: draenog Date: Fri Feb 17 11:23:13 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- fix for ambiguous call to swap function (copied from fedora)
---- Files affected:
packages/djview4:
djview4-swap.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/djview4/djview4-swap.patch
diff -u /dev/null packages/djview4/djview4-swap.patch:1.1
--- /dev/null Fri Feb 17 12:23:13 2012
+++ packages/djview4/djview4-swap.patch Fri Feb 17 12:23:08 2012
@@ -0,0 +1,35 @@
+--- 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 */
================================================================
More information about the pld-cvs-commit
mailing list