diff options
| author | Sergio Giro <sgiro@google.com> | 2015-09-23 17:15:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:15:12 +0000 |
| commit | c565bdb67b801fe2b4965b44e53dccfd9097993c (patch) | |
| tree | fae97afa559ac30497bf7b5d1df2009236f8dde7 /libutils/BasicHashtable.cpp | |
| parent | ec22417993d2a9a98ee957ffc7cd4af95debb546 (diff) | |
| parent | f777655d85af3aefa4a1683f289da1ec67988330 (diff) | |
am f777655d: resolved conflicts for 6ee734cf to stage-aosp-master
* commit 'f777655d85af3aefa4a1683f289da1ec67988330':
libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory
Diffstat (limited to 'libutils/BasicHashtable.cpp')
| -rw-r--r-- | libutils/BasicHashtable.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libutils/BasicHashtable.cpp b/libutils/BasicHashtable.cpp index 491d9e98b..1e9f05333 100644 --- a/libutils/BasicHashtable.cpp +++ b/libutils/BasicHashtable.cpp @@ -22,6 +22,8 @@ #include <utils/BasicHashtable.h> #include <utils/misc.h> +#include "SharedBuffer.h" + namespace android { BasicHashtableImpl::BasicHashtableImpl(size_t entrySize, bool hasTrivialDestructor, @@ -46,6 +48,12 @@ BasicHashtableImpl::~BasicHashtableImpl() { } +void BasicHashtableImpl::edit() { + if (mBuckets && !SharedBuffer::bufferFromData(mBuckets)->onlyOwner()) { + clone(); + } +} + void BasicHashtableImpl::dispose() { if (mBuckets) { releaseBuckets(mBuckets, mBucketCount); |