From f6a9e44805b963e4128a1955dffcd042afe053ff Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 12:50:24 +0300 Subject: [PATCH] piSwap --- qcd_utils/pult/main.cpp | 2 +- qglengine/core/gltypes.h | 1 - qglview/gltypes.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/qcd_utils/pult/main.cpp b/qcd_utils/pult/main.cpp index 337ca21..e40a74c 100644 --- a/qcd_utils/pult/main.cpp +++ b/qcd_utils/pult/main.cpp @@ -199,7 +199,7 @@ public: PIHash & clear() {pih_content.clear(); return *this;} void swap(PIHash & other) { - piSwapBinary > >(pih_content, other.pih_content); + pih_content.swap(other.pih_content); } PIHash & insert(const Key & key, const T & value) { diff --git a/qglengine/core/gltypes.h b/qglengine/core/gltypes.h index e7e8c56..d00d63f 100644 --- a/qglengine/core/gltypes.h +++ b/qglengine/core/gltypes.h @@ -128,7 +128,6 @@ inline float randomu() {return float(random()) / RAND_MAX;} inline const QSizeF operator *(const QSizeF & f, const QSizeF & s) {return QSizeF(f.width() * s.width(), f.height() * s.height());} #ifndef PIP_VERSION -template inline void piSwap(Type & f, Type & s) {Type t = f; f = s; s = t;} template inline Type piMin(const Type & f, const Type & s) {return (f > s) ? s : f;} template inline Type piMin(const Type & f, const Type & s, const Type & t) {return (f < s && f < t) ? f : ((s < t) ? s : t);} template inline Type piMax(const Type & f, const Type & s) {return (f < s) ? s : f;} diff --git a/qglview/gltypes.h b/qglview/gltypes.h index dd301f3..842d20e 100644 --- a/qglview/gltypes.h +++ b/qglview/gltypes.h @@ -127,7 +127,6 @@ inline float randomu() {return float(random()) / RAND_MAX;} inline const QSizeF operator *(const QSizeF & f, const QSizeF & s) {return QSizeF(f.width() * s.width(), f.height() * s.height());} #ifndef PIP_VERSION -template inline void piSwap(Type & f, Type & s) {Type t = f; f = s; s = t;} template inline Type piMin(const Type & f, const Type & s) {return (f > s) ? s : f;} template inline Type piMin(const Type & f, const Type & s, const Type & t) {return (f < s && f < t) ? f : ((s < t) ? s : t);} template inline Type piMax(const Type & f, const Type & s) {return (f < s) ? s : f;}