From 2a3929883d01ba26feb60c22b18ec910bc12d1e0 Mon Sep 17 00:00:00 2001 From: eschnett Date: Mon, 5 Nov 2012 18:39:13 +0000 Subject: Correct non-vectorised ifthen git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/Vectors/trunk@71 105869f7-3296-0410-a4ea-f4349344b45a --- src/vectors-4-default.h | 2 +- src/vectors-8-default.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vectors-4-default.h b/src/vectors-4-default.h index 2ef4856..0cd49ac 100644 --- a/src/vectors-4-default.h +++ b/src/vectors-4-default.h @@ -124,7 +124,7 @@ #define k4lor(x,y) k4l2r(k4r2l(x) || k4r2l(y)) #define k4lxor(x,y) k4l2r(!k4r2l(x) != !k4r2l(y)) -#define k4ifthen(x,y,z) ((x)?(y):(z)) +#define k4ifthen(x,y,z) (k4r2l(x)?(y):(z)) #define k4cmpeq(x,y) k4l2r((x)==(y)) #define k4cmpne(x,y) k4l2r((x)!=(y)) diff --git a/src/vectors-8-default.h b/src/vectors-8-default.h index dcdde8b..7ff6c8c 100644 --- a/src/vectors-8-default.h +++ b/src/vectors-8-default.h @@ -122,7 +122,7 @@ #define k8lor(x,y) k8l2r(k8r2l(x) || k8r2l(y)) #define k8lxor(x,y) k8l2r(!k8r2l(x) != !k8r2l(y)) -#define k8ifthen(x,y,z) ((x)?(y):(z)) +#define k8ifthen(x,y,z) (k8r2l(x)?(y):(z)) #define k8cmpeq(x,y) k8l2r((x)==(y)) #define k8cmpne(x,y) k8l2r((x)!=(y)) -- cgit v1.2.3