diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-08-22 01:09:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-22 01:09:44 +0000 |
| commit | 23b1f29d627af4b50c4e501067a3466e46757f89 (patch) | |
| tree | 8e14707037eaac609fe90b3446ee14e32b8e8f97 | |
| parent | c902028abd264d9e8d1e13e698ba852b34dbc1be (diff) | |
| parent | c9126876b4187c31a951a8bc921130f475e08cf9 (diff) | |
| download | net-23b1f29d627af4b50c4e501067a3466e46757f89.tar.gz | |
Merge "BpfMap.h - hide getMap()" into main am: c9126876b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2717616
Change-Id: I26798fecc846682f8d7be6d16a0a20f80b17845b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/native/bpf_headers/include/bpf/BpfMap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/native/bpf_headers/include/bpf/BpfMap.h b/common/native/bpf_headers/include/bpf/BpfMap.h index d0c3b453..847083e5 100644 --- a/common/native/bpf_headers/include/bpf/BpfMap.h +++ b/common/native/bpf_headers/include/bpf/BpfMap.h @@ -180,9 +180,9 @@ class BpfMap { const function<Result<void>(const Key& key, const Value& value, BpfMap<Key, Value>& map)>& filter); +#ifdef BPF_MAP_MAKE_VISIBLE_FOR_TESTING const unique_fd& getMap() const { return mMapFd; }; -#ifdef BPF_MAP_MAKE_VISIBLE_FOR_TESTING // Copy assignment operator - due to need for fd duping, should not be used in non-test code. BpfMap<Key, Value>& operator=(const BpfMap<Key, Value>& other) { if (this != &other) mMapFd.reset(fcntl(other.mMapFd.get(), F_DUPFD_CLOEXEC, 0)); |