commit be15fa1edd87bd7ef13cb774ba2cedbf1a6af98f
author Maciej Żenczykowski <maze@google.com> Mon Dec 30 10:14:42 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Jan 06 13:57:05 2020 +0000
tree ce7090050361d974846ad5348f76734e8680b033
parent 480c70ac148fc098de97ff5ce7ea4a87aaab97a4

remove spurious equals comparators

These are unused by virtue of the code continuing to build.

C++20 has https://en.cppreference.com/w/cpp/language/default_comparisons
but still requires explicit declaration of them with '=default' annotation.

Test: builds
Bug: 146787904
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I751ad5592acc1ed4cf763d1ca82c301f2e233e56

libbpf_android/BpfUtils.cpp

diff --git a/libbpf_android/BpfUtils.cpp b/libbpf_android/BpfUtils.cpp
index b3ff108..df8c901 100644
--- a/libbpf_android/BpfUtils.cpp
+++ b/libbpf_android/BpfUtils.cpp
@@ -57,19 +57,6 @@
  *  is. The bpf kernel code will performs a much stricter check to ensure all unused field is 0. So
  *  this syscall will normally fail with E2BIG if we don't do a memset to bpf_attr.
  */
-bool operator==(const StatsKey& lhs, const StatsKey& rhs) {
-    return ((lhs.uid == rhs.uid) && (lhs.tag == rhs.tag) && (lhs.counterSet == rhs.counterSet) &&
-            (lhs.ifaceIndex == rhs.ifaceIndex));
-}
-
-bool operator==(const UidTag& lhs, const UidTag& rhs) {
-    return ((lhs.uid == rhs.uid) && (lhs.tag == rhs.tag));
-}
-
-bool operator==(const StatsValue& lhs, const StatsValue& rhs) {
-    return ((lhs.rxBytes == rhs.rxBytes) && (lhs.txBytes == rhs.txBytes) &&
-            (lhs.rxPackets == rhs.rxPackets) && (lhs.txPackets == rhs.txPackets));
-}
 
 int bpf(int cmd, Slice bpfAttr) {
     return syscall(__NR_bpf, cmd, bpfAttr.base(), bpfAttr.size());

libbpf_android/include/bpf/BpfUtils.h

diff --git a/libbpf_android/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
index f8295e3..7afdb5b 100644
--- a/libbpf_android/include/bpf/BpfUtils.h
+++ b/libbpf_android/include/bpf/BpfUtils.h
@@ -131,10 +131,6 @@
         if (android::bpf::getBpfSupportLevel() != android::bpf::BpfLevel::NONE) return; \
     } while (0)
 
-bool operator==(const StatsValue& lhs, const StatsValue& rhs);
-bool operator==(const UidTag& lhs, const UidTag& rhs);
-bool operator==(const StatsKey& lhs, const StatsKey& rhs);
-
 }  // namespace bpf
 }  // namespace android