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 /include/utils/BasicHashtable.h | |
| 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 'include/utils/BasicHashtable.h')
| -rw-r--r-- | include/utils/BasicHashtable.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/utils/BasicHashtable.h b/include/utils/BasicHashtable.h index c235d6252..cf4705954 100644 --- a/include/utils/BasicHashtable.h +++ b/include/utils/BasicHashtable.h @@ -19,7 +19,6 @@ #include <stdint.h> #include <sys/types.h> -#include <utils/SharedBuffer.h> #include <utils/TypeHelpers.h> namespace android { @@ -55,13 +54,7 @@ protected: virtual ~BasicHashtableImpl(); void dispose(); - - inline void edit() { - if (mBuckets && !SharedBuffer::bufferFromData(mBuckets)->onlyOwner()) { - clone(); - } - } - + void edit(); void setTo(const BasicHashtableImpl& other); void clear(); |