| commit | c5a67db69c06276cb7117ae7ade7775e5ee9b522 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sat Jan 23 19:54:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 23 19:54:54 2021 +0000 |
| tree | 7a25fee20d355d04ccc15160125fde234d37e24b | |
| parent | 2dd9f28432b096a93234550e9bc58c94b7656507 [diff] | |
| parent | cf1d21c5d8093b2228df292486c35f27e8a54065 [diff] |
BpfMap - fix a clang warning: misc-unconventional-assign-operator am: 8ed7c0f9b9 am: cf1d21c5d8 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1552943 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8992b3bb71030d37751ad3e101f07841bd2b2bd0
diff --git a/libbpf_android/include/bpf/BpfMap.h b/libbpf_android/include/bpf/BpfMap.h index c42801a..bdffc0f 100644 --- a/libbpf_android/include/bpf/BpfMap.h +++ b/libbpf_android/include/bpf/BpfMap.h
@@ -133,10 +133,11 @@ return *this; } - // Move constructor - void operator=(BpfMap<Key, Value>&& other) noexcept { + // Move assignment operator + BpfMap<Key, Value>& operator=(BpfMap<Key, Value>&& other) noexcept { mMapFd = std::move(other.mMapFd); other.reset(-1); + return *this; } void reset(base::unique_fd fd) = delete;