From dee0161e4f31f06e9389db9986766395c1b1d2b8 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 27 Jan 2009 14:59:03 +0000 Subject: [PATCH] Add parenthesis around << (j+len) to avoid pedantic warning git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/TextCollection@77 3cdefd35-fc62-479d-8e8d-bae585ffb9ca --- Tools.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools.h b/Tools.h index 7baabbd..45647e8 100644 --- a/Tools.h +++ b/Tools.h @@ -55,7 +55,7 @@ public: { ulong i = index * len / W, j = index * len - i * W; - ulong mask = (j+len < W ? ~0lu << j+len : 0) + ulong mask = (j+len < W ? ~0lu << (j+len) : 0) | (W-j < W ? ~0lu >> (W-j) : 0); A[i] = (A[i] & mask) | x << j; if (j + len > W) @@ -96,7 +96,7 @@ public: static inline void SetVariableField(ulong *A, register unsigned len, register ulong index, register ulong x) { ulong i=index/W, j=index-i*W; - ulong mask = (j+len < W ? ~0lu << j+len : 0) + ulong mask = (j+len < W ? ~0lu << (j+len) : 0) | (W-j < W ? ~0lu >> (W-j) : 0); A[i] = (A[i] & mask) | x << j; if (j+len>W) { -- 2.17.1