diff options
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 4 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index cbc395b2..d3d5feb7 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -865,7 +865,7 @@ class Arguments { } int size() { - return args_.size() - 1; + return static_cast<int>(args_.size()) - 1; } private: @@ -959,7 +959,7 @@ int FuchsiaDeathTest::Wait() { 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(); } diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 74a2e202..21c611af 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -1044,7 +1044,7 @@ class Timer { } 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 |
