diff options
| -rw-r--r-- | googlemock/docs/CookBook.md | 2 | ||||
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 5 | ||||
| -rw-r--r-- | googletest/include/gtest/gtest.h | 2 | ||||
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md index 52091109..ff7f69aa 100644 --- a/googlemock/docs/CookBook.md +++ b/googlemock/docs/CookBook.md @@ -70,7 +70,7 @@ class Foo { class MockFoo : public Foo { ... MOCK_METHOD1(Add, int(Element x)); - MOCK_METHOD2(Add, int(int times, Element x); + MOCK_METHOD2(Add, int(int times, Element x)); MOCK_METHOD0(GetBar, Bar&()); MOCK_CONST_METHOD0(GetBar, const Bar&()); diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 093b4653..01e96cfe 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -115,8 +115,11 @@ inline Element* GetRawPointer(Element* p) { return p; } // // To gcc, // wchar_t == signed wchar_t != unsigned wchar_t == unsigned int +// +// gcc-9 appears to treat signed/unsigned wchar_t as ill-formed +// regardless of the signage of its underlying type. #ifdef __GNUC__ -#if !defined(__WCHAR_UNSIGNED__) +#if !defined(__WCHAR_UNSIGNED__) && (__GNUC__ < 9) // signed/unsigned wchar_t are valid types. # define GMOCK_HAS_SIGNED_WCHAR_T_ 1 #endif diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 73824428..0cb5a2e7 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -414,7 +414,7 @@ class GTEST_API_ Test { // class. static void SetUpTestSuite() {} - // Tears down the stuff shared by all tests in this test case. + // Tears down the stuff shared by all tests in this test suite. // // Google Test will call Foo::TearDownTestSuite() after running the last // test in test case Foo. Hence a sub-class can define its own diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 9bfe3153..350e6109 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -993,7 +993,7 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() { zx_status_t status; zx_handle_t child_pipe_handle; int child_pipe_fd; - status = fdio_pipe_half2(&child_pipe_fd, &child_pipe_handle); + status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle); GTEST_DEATH_TEST_CHECK_(status == ZX_OK); set_read_fd(child_pipe_fd); |