From 09ed9a99076eea76363b445f3af344024201a893 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 16 Jul 2020 13:41:50 +0300 Subject: [PATCH] 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;}