diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-06 19:53:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-06 19:53:55 +0200 |
| commit | 1ddfce4840994b6b79a3f426fcedf8f0469334ac (patch) | |
| tree | 4a5700c90dacb63f00a8d130e94ba0398b2ee371 /extra/yassl/taocrypt/include/block.hpp | |
| parent | c0977073e18d070810c20026defc63794154e288 (diff) | |
| parent | 3139aa87b4f215418740939cc8d156150c355823 (diff) | |
| download | mariadb-git-1ddfce4840994b6b79a3f426fcedf8f0469334ac.tar.gz | |
mysql-5.5.40
Diffstat (limited to 'extra/yassl/taocrypt/include/block.hpp')
| -rw-r--r-- | extra/yassl/taocrypt/include/block.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/taocrypt/include/block.hpp b/extra/yassl/taocrypt/include/block.hpp index 601d9dbce57..1e4bd454b06 100644 --- a/extra/yassl/taocrypt/include/block.hpp +++ b/extra/yassl/taocrypt/include/block.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -74,7 +74,7 @@ typename A::pointer StdReallocate(A& a, T* p, typename A::size_type oldSize, if (preserve) { A b = A(); typename A::pointer newPointer = b.allocate(newSize, 0); - memcpy(newPointer, p, sizeof(T) * min((word32) oldSize, (word32) newSize)); + memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize)); a.deallocate(p, oldSize); STL::swap(a, b); return newPointer; @@ -187,9 +187,9 @@ public: ~Block() { allocator_.deallocate(buffer_, sz_); } private: + A allocator_; word32 sz_; // size in Ts T* buffer_; - A allocator_; }; |