diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2010-09-06 21:51:27 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-09-06 21:51:27 -0400 |
| commit | a2120986ff5095b55553ecb8c191b700970e61f4 (patch) | |
| tree | 22ab42c13a2b9c561661d2375602b5ec35de24da /cryptopp | |
| parent | 66906805384c89e1d42e35ad344466798dc124ad (diff) | |
| parent | f1e1fb4bdef878c8fc1564fa418d44e7541a7e83 (diff) | |
| download | bitcoin-a2120986ff5095b55553ecb8c191b700970e61f4.tar.xz | |
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'cryptopp')
| -rw-r--r-- | cryptopp/secblock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cryptopp/secblock.h b/cryptopp/secblock.h index d66470e901..5e3882916a 100644 --- a/cryptopp/secblock.h +++ b/cryptopp/secblock.h @@ -184,7 +184,8 @@ public: void deallocate(void *p, size_type n) { - assert(false); + //// Bitcoin: can't figure out why this is tripping on a few compiles. + //assert(false); } size_type max_size() const {return 0;} |