From ef5a8f883c4e5d86f55ba50d5b6d9c805d448e69 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 19 Jul 2015 11:27:11 -0400 Subject: Cleared -Wparentheses from GCC 5.1 --- strciphr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strciphr.h b/strciphr.h index d1d11a17..6c66a855 100644 --- a/strciphr.h +++ b/strciphr.h @@ -97,9 +97,9 @@ struct CRYPTOPP_NO_VTABLE AdditiveCipherConcretePolicy : public BASE // use these to implement OperateKeystream #define CRYPTOPP_KEYSTREAM_OUTPUT_WORD(x, b, i, a) \ - PutWord(bool(x & OUTPUT_ALIGNED), b, output+i*sizeof(WordType), (x & INPUT_NULL) ? a : a ^ GetWord(bool(x & INPUT_ALIGNED), b, input+i*sizeof(WordType))); + PutWord(bool(x & OUTPUT_ALIGNED), b, output+i*sizeof(WordType), (x & INPUT_NULL) ? (a) : (a) ^ GetWord(bool(x & INPUT_ALIGNED), b, input+i*sizeof(WordType))); #define CRYPTOPP_KEYSTREAM_OUTPUT_XMM(x, i, a) {\ - __m128i t = (x & INPUT_NULL) ? a : _mm_xor_si128(a, (x & INPUT_ALIGNED) ? _mm_load_si128((__m128i *)input+i) : _mm_loadu_si128((__m128i *)input+i));\ + __m128i t = (x & INPUT_NULL) ? (a) : _mm_xor_si128(a, (x & INPUT_ALIGNED) ? _mm_load_si128((__m128i *)input+i) : _mm_loadu_si128((__m128i *)input+i));\ if (x & OUTPUT_ALIGNED) _mm_store_si128((__m128i *)output+i, t);\ else _mm_storeu_si128((__m128i *)output+i, t);} #define CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(x, y) \ -- cgit v1.2.1