diff options
| author | Gennadiy Rozental <rogeeff@google.com> | 2020-07-09 17:35:44 (GMT) |
|---|---|---|
| committer | Gennadiy Rozental <rogeeff@google.com> | 2020-07-09 17:35:44 (GMT) |
| commit | c7f05e08af7ba9e7de8e9cd5e2c6bff965b42635 (patch) | |
| tree | c18ae5f70318e79fb3febffd1ed150aa1cd57e8f /googletest | |
| parent | 592d464243b5477fe0b2d5350f797c804611f985 (diff) | |
| parent | a2533417cab3d38e71957d807468274a6605d20b (diff) | |
| download | googletest-c7f05e08af7ba9e7de8e9cd5e2c6bff965b42635.zip googletest-c7f05e08af7ba9e7de8e9cd5e2c6bff965b42635.tar.gz googletest-c7f05e08af7ba9e7de8e9cd5e2c6bff965b42635.tar.bz2 | |
Merge pull request #2872 from elindsey:master
PiperOrigin-RevId: 320224740
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/src/gtest-port.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index c180233..3f39f71 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -198,7 +198,8 @@ size_t GetThreadCount() { if (sysctl(mib, miblen, NULL, &size, NULL, 0)) { return 0; } - mib[5] = size / mib[4]; + + mib[5] = static_cast<int>(size / static_cast<size_t>(mib[4])); // populate array of structs struct kinfo_proc info[mib[5]]; @@ -207,8 +208,8 @@ size_t GetThreadCount() { } // exclude empty members - int nthreads = 0; - for (size_t i = 0; i < size / mib[4]; i++) { + size_t nthreads = 0; + for (size_t i = 0; i < size / static_cast<size_t>(mib[4]); i++) { if (info[i].p_tid != -1) nthreads++; } |