]> git.pld-linux.org Git - packages/djview4.git/commitdiff
- fix for ambiguous call to swap function (copied from fedora)
authorKacper Kornet <draenog@pld-linux.org>
Fri, 17 Feb 2012 11:23:08 +0000 (11:23 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    djview4-swap.patch -> 1.1

djview4-swap.patch [new file with mode: 0644]

diff --git a/djview4-swap.patch b/djview4-swap.patch
new file mode 100644 (file)
index 0000000..828eaaa
--- /dev/null
@@ -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 */
This page took 0.096881 seconds and 4 git commands to generate.