aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetReduce
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2010-12-03 16:18:49 -0500
committerBarry Wardell <barry.wardell@gmail.com>2011-12-14 18:25:47 +0000
commite2741f251253834cd87412611c5c08d3c6184d3b (patch)
tree9c489a3ebac5f57de69a81a3e5b5dd29838d4a7d /Carpet/CarpetReduce
parent301b6712f5c772f23156893c00f80b19b69a87da (diff)
CarpetReduce: Reformat
Diffstat (limited to 'Carpet/CarpetReduce')
-rw-r--r--Carpet/CarpetReduce/src/bits.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/Carpet/CarpetReduce/src/bits.h b/Carpet/CarpetReduce/src/bits.h
index 65bd450da..1f3ad17eb 100644
--- a/Carpet/CarpetReduce/src/bits.h
+++ b/Carpet/CarpetReduce/src/bits.h
@@ -5,7 +5,7 @@
#define BMSK(n) (1U << (n))
/* whether bit n in value v is set */
-#define BGET(v,n) (!!((v) & BMSK(n)))
+#define BGET(v,n) (!! ((v) & BMSK(n)))
/* set, clear, or invert bit n in value v */
#define BSET(v,n) ((v) | BMSK(n))
@@ -13,13 +13,13 @@
#define BINV(v,n) ((v) ^ BMSK(n))
/* set bit n in value v to b */
-#define BCPY(v,b,n) ((b) ? BSET(v,n) : BCLR(v,n))
+#define BCPY(v,n,b) ((b) ? BSET(v,n) : BCLR(v,n))
/* count the number of set bits */
-#define BCNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0F) % 0xFF)
-#define BX_(x) ((x) \
- - (((x)>>1)&0x77777777) \
- - (((x)>>2)&0x33333333) \
- - (((x)>>3)&0x11111111))
+#define BCNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0FU) % 0xFFU)
+#define BX_(x) ((x) \
+ - (((x)>>1)&0x77777777U) \
+ - (((x)>>2)&0x33333333U) \
+ - (((x)>>3)&0x11111111U))
#endif /* #ifndef BITS_H */