Merge 'master' into 'constexpr'

pull/131/merge
Jeffrey Walton 2016-09-07 12:29:43 -04:00
commit 53bc3f146a
1 changed files with 1 additions and 1 deletions

View File

@ -1199,7 +1199,7 @@ bool TestSecBlock()
temp &= (block.size() == SIZE*2); temp &= (block.size() == SIZE*2);
for (size_t i = 0; i < block.size()/2; i++) for (size_t i = 0; i < block.size()/2; i++)
temp &= (block[i] == 0xaaaaaaaaaaaaaaaa); temp &= (block[i] == W64LIT(0xaaaaaaaaaaaaaaaa));
for (size_t i = block.size()/2; i < block.size(); i++) for (size_t i = block.size()/2; i < block.size(); i++)
temp &= (block[i] == 0); temp &= (block[i] == 0);