diff options
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/cmake/gtest_main.pc.in | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-port.cc | 2 | ||||
| -rw-r--r-- | googletest/test/googletest-death-test_ex_test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/gtest-unittest-api_test.cc | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in index 1e01bd19..38c88c54 100644 --- a/googletest/cmake/gtest_main.pc.in +++ b/googletest/cmake/gtest_main.pc.in @@ -5,6 +5,6 @@ Name: gtest_main Description: GoogleTest (with main() function) Version: @PROJECT_VERSION@ URL: https://github.com/google/googletest -Requires: gtest +Requires: gtest = @PROJECT_VERSION@ Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@ Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index a05c50a3..c1802337 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -208,7 +208,7 @@ size_t GetThreadCount() { // exclude empty members int nthreads = 0; - for (int i = 0; i < size / mib[4]; i++) { + for (size_t i = 0; i < size / mib[4]; i++) { if (info[i].p_tid != -1) nthreads++; } diff --git a/googletest/test/googletest-death-test_ex_test.cc b/googletest/test/googletest-death-test_ex_test.cc index 7ea5b946..7219680d 100644 --- a/googletest/test/googletest-death-test_ex_test.cc +++ b/googletest/test/googletest-death-test_ex_test.cc @@ -59,7 +59,7 @@ TEST(CxxExceptionDeathTest, ExceptionIsFailure) { class TestException : public std::exception { public: - const char* what() const throw() override { return "exceptional message"; } + const char* what() const noexcept override { return "exceptional message"; } }; TEST(CxxExceptionDeathTest, PrintsMessageForStdExceptions) { diff --git a/googletest/test/gtest-unittest-api_test.cc b/googletest/test/gtest-unittest-api_test.cc index 7d2d8cc9..25a8afb2 100644 --- a/googletest/test/gtest-unittest-api_test.cc +++ b/googletest/test/gtest-unittest-api_test.cc @@ -55,8 +55,8 @@ class UnitTestHelper { // name. The caller is responsible for deleting the array. static TestSuite const** GetSortedTestSuites() { UnitTest& unit_test = *UnitTest::GetInstance(); - auto const** const test_suites = - new const TestSuite*[unit_test.total_test_suite_count()]; + auto const** const test_suites = new const TestSuite*[static_cast<size_t>( + unit_test.total_test_suite_count())]; for (int i = 0; i < unit_test.total_test_suite_count(); ++i) test_suites[i] = unit_test.GetTestSuite(i); @@ -83,8 +83,8 @@ class UnitTestHelper { // sorted by the test name. The caller is responsible for deleting the // array. static TestInfo const** GetSortedTests(const TestSuite* test_suite) { - TestInfo const** const tests = - new const TestInfo*[test_suite->total_test_count()]; + TestInfo const** const tests = new const TestInfo*[static_cast<size_t>( + test_suite->total_test_count())]; for (int i = 0; i < test_suite->total_test_count(); ++i) tests[i] = test_suite->GetTestInfo(i); |