util: Replace raw struct functions with stdplus
These functions were recently added to stdplus as they are useful across
projects.
Change-Id: Ia383715a253fce71dacc6bc72b1771393e8ed600
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/test/test_neighbor.cpp b/test/test_neighbor.cpp
index c7d926e..6b14912 100644
--- a/test/test_neighbor.cpp
+++ b/test/test_neighbor.cpp
@@ -8,6 +8,7 @@
#include <cstring>
#include <stdexcept>
+#include <stdplus/raw.hpp>
#include <string>
#include <vector>
@@ -115,7 +116,8 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_FALSE(neighbors[0].mac);
- EXPECT_TRUE(equal(addr, std::get<in_addr>(neighbors[0].address)));
+ EXPECT_TRUE(
+ stdplus::raw::equal(addr, std::get<in_addr>(neighbors[0].address)));
}
TEST(ParseNeighbor, FilterInterface)
@@ -150,7 +152,8 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_FALSE(neighbors[0].mac);
- EXPECT_TRUE(equal(addr, std::get<in_addr>(neighbors[0].address)));
+ EXPECT_TRUE(
+ stdplus::raw::equal(addr, std::get<in_addr>(neighbors[0].address)));
}
TEST(ParseNeighbor, FilterState)
@@ -185,7 +188,8 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_FALSE(neighbors[0].mac);
- EXPECT_TRUE(equal(addr, std::get<in_addr>(neighbors[0].address)));
+ EXPECT_TRUE(
+ stdplus::raw::equal(addr, std::get<in_addr>(neighbors[0].address)));
}
TEST(ParseNeighbor, Full)
@@ -225,8 +229,9 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_TRUE(neighbors[0].mac);
- EXPECT_TRUE(equal(mac, *neighbors[0].mac));
- EXPECT_TRUE(equal(addr, std::get<in6_addr>(neighbors[0].address)));
+ EXPECT_TRUE(stdplus::raw::equal(mac, *neighbors[0].mac));
+ EXPECT_TRUE(
+ stdplus::raw::equal(addr, std::get<in6_addr>(neighbors[0].address)));
}
} // namespace detail