commit 3777953b3f1ec39d3a481143166b5b9f2dfb4e0c
author Austin Schuh <austin.linux@gmail.com> Sat Nov 20 08:35:04 2021 -0800
committer Gerrit Code Review <gerrit@software.frc971.org> Sat Nov 20 08:35:04 2021 -0800
tree 85650289dacecd48d75bf4f53f9a2fffc9666404
parent f52045f60bc9b64a88391a4ac930e43a47b2c2ef
parent ad9e5eb68d3d2c1d962b08e4da3f58b67daea94e

Merge "Use the event loop name instead of thread name for AOS_LOG"

aos/events/logging/crc32.h

diff --git a/aos/events/logging/crc32.h b/aos/events/logging/crc32.h
index 9e7c3f2..b193f61 100644
--- a/aos/events/logging/crc32.h
+++ b/aos/events/logging/crc32.h
@@ -1,3 +1,6 @@
+#ifndef AOS_EVENTS_LOGGING_CRC32_H_
+#define AOS_EVENTS_LOGGING_CRC32_H_
+
 #include <stdint.h>
 
 #include <optional>
@@ -13,3 +16,5 @@
     std::optional<uint32_t> current_checksum = std::nullopt);
 
 }  // namespace aos
+
+#endif  // AOS_EVENTS_LOGGING_CRC32_H_

aos/testing/flatbuffer_eq.h

diff --git a/aos/testing/flatbuffer_eq.h b/aos/testing/flatbuffer_eq.h
index c4b708b..2f7b345 100644
--- a/aos/testing/flatbuffer_eq.h
+++ b/aos/testing/flatbuffer_eq.h
@@ -51,7 +51,7 @@
 template <typename T>
 class FlatbufferEqMatcher : public ::testing::MatcherInterface<const T *> {
  public:
-  FlatbufferEqMatcher(aos::FlatbufferSpan<T> expected)
+  FlatbufferEqMatcher(aos::FlatbufferVector<T> expected)
       : expected_(std::move(expected)) {}
   ~FlatbufferEqMatcher() override = default;
 
@@ -70,7 +70,7 @@
   }
 
  private:
-  const aos::FlatbufferSpan<T> expected_;
+  const aos::FlatbufferVector<T> expected_;
 };
 
 // Returns a googlemock matcher which will compare a `const T *` or a `const
@@ -81,7 +81,7 @@
 template <typename T>
 inline auto FlatbufferEq(const aos::NonSizePrefixedFlatbuffer<T> &expected) {
   return FlatbufferUnwrapped(::testing::MakeMatcher(
-      new FlatbufferEqMatcher(aos::FlatbufferSpan<T>(expected))));
+      new FlatbufferEqMatcher(aos::FlatbufferVector<T>(expected))));
 }
 
 }  // namespace testing