diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-07-19 11:27:11 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2015-07-19 11:27:11 -0400 |
| commit | ef5a8f883c4e5d86f55ba50d5b6d9c805d448e69 (patch) | |
| tree | 32230beb905d11c84c2ccda51d56074bfcbd9a64 /strciphr.h | |
| parent | d04b813e8b078e717992b86b8b6103db0bd2cec3 (diff) | |
| download | cryptopp-git-ef5a8f883c4e5d86f55ba50d5b6d9c805d448e69.tar.gz | |
Cleared -Wparentheses from GCC 5.1
Diffstat (limited to 'strciphr.h')
| -rw-r--r-- | strciphr.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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<WordType>(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<WordType>(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) \ |