commit 1ef814da951bf4fb8ccd5089dc4f7251115710e8
author Maciej Żenczykowski <maze@google.com> Tue Aug 22 00:32:09 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 22 00:32:09 2023 +0000
tree 89cecc828095ce9c973f6e61bec9d3e467116348
parent 1d1c0e72825ac9d4b4997710e617a8533cdb012c
parent 12c0ea929c3343319da2fd95c8aa21c241fdd677

Merge "BpfMap.h - hide getMap()" into main

staticlibs/native/bpf_headers/include/bpf/BpfMap.h

diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
index d0c3b45..847083e 100644
--- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
+++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -180,9 +180,9 @@
             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));