diff options
author | noloader <noloader@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2015-07-14 05:17:01 +0000 |
---|---|---|
committer | noloader <noloader@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2015-07-14 05:17:01 +0000 |
commit | f16ccf2cb36c7ea400accc37a173f1e9bf202724 (patch) | |
tree | 40973e4fc2e0078f4fce957358865d37e2479572 | |
parent | 88ded51bac648d6d673c5905110336f1342456a4 (diff) | |
download | cryptopp-f16ccf2cb36c7ea400accc37a173f1e9bf202724.tar.gz |
Cleared compile error masked behind ASSERT
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@586 57ff6487-cd31-0410-9ec3-f628ee90f5f0
-rw-r--r-- | misc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -25,8 +25,8 @@ void xorbuf(byte *buf, const byte *mask, size_t count) { if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask)) { - assert(IsAlignedOn(input, GetStrictAlignedOn<word64>(buf))); - assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask))); + assert(IsAlignedOn(buf, GetStrictAlignmentOf<word64>())); + assert(IsAlignedOn(mask, GetStrictAlignmentOf<word64>())); for (i=0; i<count/8; i++) ((word64*)buf)[i] ^= ((word64*)mask)[i]; @@ -58,9 +58,9 @@ void xorbuf(byte *output, const byte *input, const byte *mask, size_t count) { if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(output) && IsStrictAligned<word64>(input) && IsStrictAligned<word64>(mask)) { - assert(IsAlignedOn(output, GetStrictAlignedOn<word64>(output))); - assert(IsAlignedOn(input, GetStrictAlignedOn<word64>(input))); - assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask))); + assert(IsAlignedOn(output, GetStrictAlignmentOf<word64>())); + assert(IsAlignedOn(input, GetStrictAlignmentOf<word64>())); + assert(IsAlignedOn(mask, GetStrictAlignmentOf<word64>())); for (i=0; i<count/8; i++) ((word64*)output)[i] = ((word64*)input)[i] ^ ((word64*)mask)[i]; @@ -96,8 +96,8 @@ bool VerifyBufsEqual(const byte *buf, const byte *mask, size_t count) word32 acc32 = 0; if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask)) { - assert(IsAlignedOn(buf, GetStrictAlignedOn<word64>(buf))); - assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask))); + assert(IsAlignedOn(buf, GetStrictAlignmentOf<word64>())); + assert(IsAlignedOn(mask, GetStrictAlignmentOf<word64>())); word64 acc64 = 0; for (i=0; i<count/8; i++) |