From d41220b301a2b6fd9707cf0be35f12ce0cab7376 Mon Sep 17 00:00:00 2001
From: Eric Lombrozo <elombrozo@gmail.com>
Date: Wed, 20 Mar 2013 19:04:40 -0700
Subject: [PATCH] Removed short-circuit evaluation potential.

---
 field.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/field.cpp b/field.cpp
index 7a0eb0e..b57ffc7 100644
--- a/field.cpp
+++ b/field.cpp
@@ -64,7 +64,7 @@ void FieldElem::Normalize() {
     n[0] = t0; n[1] = t1; n[2] = t2; n[3] = t3; n[4] = t4;
 
     // Subtract p if result >= p
-    uint64_t mask = (uint64_t)~(-(int64_t)(n[4] == 0xFFFFFFFFFFFFULL && n[3] == 0xFFFFFFFFFFFFFULL && n[2] == 0xFFFFFFFFFFFFFULL && n[1] == 0xFFFFFFFFFFFFFULL && n[0] >= 0xFFFFEFFFFFC2FULL));
+    uint64_t mask = -(int64_t)((n[4] < 0xFFFFFFFFFFFFULL) | (n[3] < 0xFFFFFFFFFFFFFULL) | (n[2] < 0xFFFFFFFFFFFFFULL) | (n[1] < 0xFFFFFFFFFFFFFULL) | (n[0] < 0xFFFFEFFFFFC2FULL));
     n[4] &= mask;
     n[3] &= mask;
     n[2] &= mask;