diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2010-09-09 14:26:53 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-09-09 14:26:53 -0400 |
commit | 90e165aa0c702a7efcbfc1e452e7f82dbd8411d0 (patch) | |
tree | 4a629be51e005a33f1547eecd04e0ea88cababa2 /cryptopp | |
parent | a2120986ff5095b55553ecb8c191b700970e61f4 (diff) | |
parent | 7629d36a530087806e80ed3c5866e8ec64319828 (diff) | |
download | bitcoin-90e165aa0c702a7efcbfc1e452e7f82dbd8411d0.tar.xz |
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'cryptopp')
-rw-r--r-- | cryptopp/secblock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptopp/secblock.h b/cryptopp/secblock.h index 5e3882916a..2025757dbb 100644 --- a/cryptopp/secblock.h +++ b/cryptopp/secblock.h @@ -184,8 +184,8 @@ public: void deallocate(void *p, size_type n) { - //// Bitcoin: can't figure out why this is tripping on a few compiles. - //assert(false); + //// Bitcoin: don't know why this trips, probably a false alarm, depends on the compiler used. + //assert(false); } size_type max_size() const {return 0;} |