gfe-relnote: n/a(code not in use) a few changes to improve SimpleLinkedHashMap's portability. Platformize CHECK macro; Signed integer literal to unsigned. PiperOrigin-RevId: 245428602 Change-Id: I7aa33a0eaf20c29d55de3087990b9999a073421a
diff --git a/common/platform/api/quiche_logging.h b/common/platform/api/quiche_logging.h new file mode 100644 index 0000000..15f5bf3 --- /dev/null +++ b/common/platform/api/quiche_logging.h
@@ -0,0 +1,6 @@ +#ifndef QUICHE_COMMON_PLATFORM_API_QUICHE_LOGGING_H_ +#define QUICHE_COMMON_PLATFORM_API_QUICHE_LOGGING_H_ + +#include "net/quiche/common/platform/impl/quiche_logging_impl.h" + +#endif // QUICHE_COMMON_PLATFORM_API_QUICHE_LOGGING_H_
diff --git a/common/simple_linked_hash_map.h b/common/simple_linked_hash_map.h index 8ff1a2b..c99585e 100644 --- a/common/simple_linked_hash_map.h +++ b/common/simple_linked_hash_map.h
@@ -21,6 +21,7 @@ #include <type_traits> #include <utility> +#include "net/third_party/quiche/src/common/platform/api/quiche_logging.h" #include "net/third_party/quiche/src/common/platform/api/quiche_unordered_containers.h" namespace quiche {
diff --git a/common/simple_linked_hash_map_test.cc b/common/simple_linked_hash_map_test.cc index 00179b3..ae73aa0 100644 --- a/common/simple_linked_hash_map_test.cc +++ b/common/simple_linked_hash_map_test.cc
@@ -182,21 +182,21 @@ TEST(LinkedHashMapTest, Erase) { SimpleLinkedHashMap<int, int> m; ASSERT_EQ(0u, m.size()); - EXPECT_EQ(0, m.erase(2)); // Nothing to erase yet + EXPECT_EQ(0u, m.erase(2)); // Nothing to erase yet m.insert(std::make_pair(2, 12)); ASSERT_EQ(1u, m.size()); - EXPECT_EQ(1, m.erase(2)); + EXPECT_EQ(1u, m.erase(2)); EXPECT_EQ(0u, m.size()); - EXPECT_EQ(0, m.erase(2)); // Make sure nothing bad happens if we repeat. + EXPECT_EQ(0u, m.erase(2)); // Make sure nothing bad happens if we repeat. EXPECT_EQ(0u, m.size()); } TEST(LinkedHashMapTest, Erase2) { SimpleLinkedHashMap<int, int> m; ASSERT_EQ(0u, m.size()); - EXPECT_EQ(0, m.erase(2)); // Nothing to erase yet + EXPECT_EQ(0u, m.erase(2)); // Nothing to erase yet m.insert(std::make_pair(2, 12)); m.insert(std::make_pair(1, 11)); @@ -205,8 +205,8 @@ ASSERT_EQ(4u, m.size()); // Erase middle two - EXPECT_EQ(1, m.erase(1)); - EXPECT_EQ(1, m.erase(3)); + EXPECT_EQ(1u, m.erase(1)); + EXPECT_EQ(1u, m.erase(3)); EXPECT_EQ(2u, m.size()); @@ -220,14 +220,14 @@ ++it; ASSERT_TRUE(it == m.end()); - EXPECT_EQ(0, m.erase(1)); // Make sure nothing bad happens if we repeat. + EXPECT_EQ(0u, m.erase(1)); // Make sure nothing bad happens if we repeat. ASSERT_EQ(2u, m.size()); - EXPECT_EQ(1, m.erase(2)); - EXPECT_EQ(1, m.erase(4)); + EXPECT_EQ(1u, m.erase(2)); + EXPECT_EQ(1u, m.erase(4)); ASSERT_EQ(0u, m.size()); - EXPECT_EQ(0, m.erase(1)); // Make sure nothing bad happens if we repeat. + EXPECT_EQ(0u, m.erase(1)); // Make sure nothing bad happens if we repeat. ASSERT_EQ(0u, m.size()); }