From 910b55815be16109f04f4180e9adee14fb4ce281 Mon Sep 17 00:00:00 2001
From: Corey Tabaka <eieio@google.com>
Date: Thu, 5 Nov 2020 10:25:16 -0800
Subject: [PATCH] Fix overflow warnings (errors) in tests on 32bit builds.

---
 test/serializer_tests.cpp | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/test/serializer_tests.cpp b/test/serializer_tests.cpp
index af86280..c0e39eb 100644
--- a/test/serializer_tests.cpp
+++ b/test/serializer_tests.cpp
@@ -2965,24 +2965,24 @@ TEST(Serializer, size_t) {
   EXPECT_EQ(expected, writer.data());
   writer.clear();
 
-  if (sizeof(std::size_t) == sizeof(std::uint64_t)) {
-    // Min U64.
-    value = (1LLU << 32);
-    status = serializer.Write(value);
-    ASSERT_TRUE(status);
-    expected = Compose(EncodingByte::U64, Integer<std::uint64_t>(1LLU << 32));
-    EXPECT_EQ(expected, writer.data());
-    writer.clear();
+#if SIZE_MAX == UINT64_MAX
+  // Min U64.
+  value = (1LLU << 32);
+  status = serializer.Write(value);
+  ASSERT_TRUE(status);
+  expected = Compose(EncodingByte::U64, Integer<std::uint64_t>(1LLU << 32));
+  EXPECT_EQ(expected, writer.data());
+  writer.clear();
 
-    // Max U64.
-    value = 0xffffffffffffffffLLU;
-    status = serializer.Write(value);
-    ASSERT_TRUE(status);
-    expected = Compose(EncodingByte::U64,
-                       Integer<std::uint64_t>(0xffffffffffffffffLLU));
-    EXPECT_EQ(expected, writer.data());
-    writer.clear();
-  }
+  // Max U64.
+  value = 0xffffffffffffffffLLU;
+  status = serializer.Write(value);
+  ASSERT_TRUE(status);
+  expected =
+      Compose(EncodingByte::U64, Integer<std::uint64_t>(0xffffffffffffffffLLU));
+  EXPECT_EQ(expected, writer.data());
+  writer.clear();
+#endif
 }
 
 TEST(Deserializer, size_t) {
@@ -3039,20 +3039,20 @@ TEST(Deserializer, size_t) {
   ASSERT_TRUE(status);
   EXPECT_EQ(0xffffffffU, value);
 
-  if (sizeof(std::size_t) == sizeof(std::uint64_t)) {
-    // Min U64.
-    reader.Set(Compose(EncodingByte::U64, Integer<std::uint64_t>(0)));
-    status = deserializer.Read(&value);
-    ASSERT_TRUE(status);
-    EXPECT_EQ(0U, value);
+#if SIZE_MAX == UINT64_MAX
+  // Min U64.
+  reader.Set(Compose(EncodingByte::U64, Integer<std::uint64_t>(0)));
+  status = deserializer.Read(&value);
+  ASSERT_TRUE(status);
+  EXPECT_EQ(0U, value);
 
-    // Max U64.
-    reader.Set(Compose(EncodingByte::U64,
-                       Integer<std::uint64_t>(0xffffffffffffffffLLU)));
-    status = deserializer.Read(&value);
-    ASSERT_TRUE(status);
-    EXPECT_EQ(0xffffffffffffffffLLU, value);
-  }
+  // Max U64.
+  reader.Set(Compose(EncodingByte::U64,
+                     Integer<std::uint64_t>(0xffffffffffffffffLLU)));
+  status = deserializer.Read(&value);
+  ASSERT_TRUE(status);
+  EXPECT_EQ(0xffffffffffffffffLLU, value);
+#endif
 
   // Test short payload.
   reader.Set(Compose(EncodingByte::U32));
