From bcb9448afdd0e4968d536b4549622318f4b6a2d5 Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Fri, 17 Feb 2012 11:23:08 +0000 Subject: [PATCH] - fix for ambiguous call to swap function (copied from fedora) Changed files: djview4-swap.patch -> 1.1 --- djview4-swap.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 djview4-swap.patch diff --git a/djview4-swap.patch b/djview4-swap.patch new file mode 100644 index 0000000..828eaaa --- /dev/null +++ b/djview4-swap.patch @@ -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 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); + if (l < h) { +- swap(v[l],v[h]); ++ swapper(v[l],v[h]); + goto loop; + } + /* Finish up */ -- 2.44.0