Fix the build on Windows (#3332)

Author: wilhuff

Firestore/core/src/firebase/firestore/nanopb/writer.cc

@@ -62,14 +62,15 @@ ByteStringWriter::~ByteStringWriter() {
 void ByteStringWriter::Append(const void* data, size_t size) {
   if (size == 0) return;
 
+  pb_size_t pb_size = CheckedSize(size);
   size_t current_size = this->size();
-  size_t min_capacity = current_size + size;
+  size_t min_capacity = current_size + pb_size;
   HARD_ASSERT(min_capacity >= current_size);  // Avoid overflow
 
   Reserve(min_capacity);
   uint8_t* pos = this->pos();
   std::memcpy(pos, data, size);
-  buffer_->size += size;
+  buffer_->size += pb_size;
 }
 
 void ByteStringWriter::Reserve(size_t min_capacity) {

Firestore/core/src/firebase/firestore/timestamp.cc

@@ -31,7 +31,7 @@ namespace firebase {
 
 namespace {
 
-constexpr int32_t kNanosPerSecond = 1E9;
+constexpr int32_t kNanosPerSecond = 1000 * 1000 * 1000;
 
 /**
  * Creates a `Timestamp` from the given non-normalized inputs.

Firestore/core/test/firebase/firestore/model/field_value_test.cc

@@ -218,11 +218,13 @@ static time_point kDate2 = testutil::MakeTimePoint(2016, 10, 21, 15, 32, 0);
 static Timestamp kTimestamp2{1477063920, 0};
 
 TEST(FieldValueTest, Equality) {
+  // Avoid statically dividing by zero; MSVC considers this an error.
+  double zero = 0.0;
   testutil::EqualsTester<FieldValue>()
       .AddEqualityGroup(FieldValue::Null(), Value(nullptr))
       .AddEqualityGroup(FieldValue::False(), Value(false))
       .AddEqualityGroup(FieldValue::True(), Value(true))
-      .AddEqualityGroup(Value(0.0 / 0.0), Value(ToDouble(kCanonicalNanBits)),
+      .AddEqualityGroup(Value(0.0 / zero), Value(ToDouble(kCanonicalNanBits)),
                         Value(ToDouble(kAlternateNanBits)),
                         Value(std::nan("1")), Value(std::nan("2")))
       // -0.0 and 0.0 compareTo the same but are not equal.

Firestore/core/test/firebase/firestore/timestamp_test.cc

@@ -39,6 +39,7 @@ using Ms = std::chrono::milliseconds;
 
 const auto kUpperBound = 253402300800L - 1;
 const auto kLowerBound = -62135596800L;
+constexpr int32_t kNanosPerSecond = 1000 * 1000 * 1000;
 
 // For near-bounds tests that use <chrono>, it's important to only run them if
 // system_clock::duration can represent values this large (e.g., on Linux, it's
@@ -91,7 +92,7 @@ TEST(Timestamp, Now) {
   int64_t seconds_diff = spec.tv_sec - now.seconds();
   int64_t nanos_diff = spec.tv_nsec - now.nanoseconds();
 
-  nanos_diff = std::abs(seconds_diff * 1E9 + nanos_diff);
+  nanos_diff = std::abs(seconds_diff * kNanosPerSecond + nanos_diff);
 
   // Assert that time produced by Timestamp and Abseil are within 10ms of each
   // other. In practice these are only a few microseconds apart, but the