From f6a9e44805b963e4128a1955dffcd042afe053ff Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 12:50:24 +0300 Subject: [PATCH 1/6] 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;} From 77c2296320f08ffd77de5f8005ee5201ed4a85a2 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 12:52:59 +0300 Subject: [PATCH 2/6] pip 24 --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 6143700..1045b27 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 614370096cc0a2deb45790b69d27eada2fe237e0 +Subproject commit 1045b274fb430286dc09a06b4ab2bfe29e53c889 From afd15e20f60d298d4ef829b6c26920b16dea3775 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 12:58:31 +0300 Subject: [PATCH 3/6] fix warning --- qad/utils/qad_locations.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad/utils/qad_locations.h b/qad/utils/qad_locations.h index 8fba7c0..48fdfc1 100644 --- a/qad/utils/qad_locations.h +++ b/qad/utils/qad_locations.h @@ -26,7 +26,7 @@ namespace QAD { - enum QAD_EXPORT LocationType { + enum LocationType { ltConfig, ltCache, }; From a5d75fec0914158ffc5cf8762945b6358084317a Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 13:05:49 +0300 Subject: [PATCH 4/6] includes --- qad/utils/qad_locations.cpp | 1 + qad/utils/qad_locations.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qad/utils/qad_locations.cpp b/qad/utils/qad_locations.cpp index bcc9d6e..54e3e32 100644 --- a/qad/utils/qad_locations.cpp +++ b/qad/utils/qad_locations.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) # include #else diff --git a/qad/utils/qad_locations.h b/qad/utils/qad_locations.h index 48fdfc1..3168b18 100644 --- a/qad/utils/qad_locations.h +++ b/qad/utils/qad_locations.h @@ -21,7 +21,7 @@ #define QAD_LOCATIONS_H #include "qad_export.h" -#include +#include namespace QAD { From 09ed9a99076eea76363b445f3af344024201a893 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 13:41:50 +0300 Subject: [PATCH 5/6] compile fixes --- pip | 2 +- qglengine/core/gltypes.h | 1 + qglview/gltypes.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pip b/pip index 1045b27..478f0a7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1045b274fb430286dc09a06b4ab2bfe29e53c889 +Subproject commit 478f0a7fd3b9b39c53080a524536102fd72c8407 diff --git a/qglengine/core/gltypes.h b/qglengine/core/gltypes.h index d00d63f..df9e232 100644 --- a/qglengine/core/gltypes.h +++ b/qglengine/core/gltypes.h @@ -128,6 +128,7 @@ 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(T & f, T & s) {T 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 842d20e..00cf1b5 100644 --- a/qglview/gltypes.h +++ b/qglview/gltypes.h @@ -127,6 +127,7 @@ 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(T & f, T & s) {T 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;} From 16e52701bef080efd48249d140af150490c87eb9 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 13:44:26 +0300 Subject: [PATCH 6/6] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 478f0a7..c642702 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 478f0a7fd3b9b39c53080a524536102fd72c8407 +Subproject commit c642702265ccac3144cf234169d11d82b3432fb8