aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a>2012-11-05 18:39:13 +0000
committereschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a>2012-11-05 18:39:13 +0000
commit2a3929883d01ba26feb60c22b18ec910bc12d1e0 (patch)
treeb1099983bf1e0ad46082163e23eb17900f536a67
parent2b63f900977ae8a6691eab3a26147b9a67260462 (diff)
Correct non-vectorised ifthen
git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/Vectors/trunk@71 105869f7-3296-0410-a4ea-f4349344b45a
-rw-r--r--src/vectors-4-default.h2
-rw-r--r--src/vectors-8-default.h2
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))