commit 566fdcc928b749dd79c730fe14b5f79c07999d7b
author Andy Soffer <asoffer@google.com> Wed Apr 21 10:24:17 2021 -0400
committer Andy Soffer <asoffer@google.com> Wed Apr 21 10:24:17 2021 -0400
tree e5b2d10c68ae27e68c7758f0cf2948270681f6d1
parent eaf9a3fd77869cf95befb87455a2e2a2e85044ff
parent 050b51751840837e9da6dad684c5ae0f87ab1f60

Merge pull request #3364 from jbampton:fix-spelling

PiperOrigin-RevId: 369217358

googletest/src/gtest-death-test.cc

diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index cbc395b..d3d5feb 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -865,7 +865,7 @@
   }
 
   int size() {
-    return args_.size() - 1;
+    return static_cast<int>(args_.size()) - 1;
   }
 
  private:
@@ -959,7 +959,7 @@
   GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
 
   GTEST_DEATH_TEST_CHECK_(buffer.flags & ZX_INFO_PROCESS_FLAG_EXITED);
-  set_status(buffer.return_code);
+  set_status(static_cast<int>(buffer.return_code));
   return status();
 }
 

googletest/src/gtest.cc

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 74a2e20..21c611a 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -1044,7 +1044,7 @@
   }
 
  private:
-  std::chrono::time_point<std::chrono::steady_clock> start_;
+  std::chrono::steady_clock::time_point start_;
 };
 
 // Returns a timestamp as milliseconds since the epoch. Note this time may jump