diff options
Diffstat (limited to 'third_party/googletest')
| -rw-r--r-- | third_party/googletest/README.libvpx | 4 | ||||
| -rw-r--r-- | third_party/googletest/src/include/gtest/gtest.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/third_party/googletest/README.libvpx b/third_party/googletest/README.libvpx index da6f77804..f4ca22bba 100644 --- a/third_party/googletest/README.libvpx +++ b/third_party/googletest/README.libvpx @@ -20,3 +20,7 @@ Local Modifications: LICENSE README.md src + +- Make WithParamInterface<T>::GetParam static in order to avoid + initialization issues + https://github.com/google/googletest/pull/1830 diff --git a/third_party/googletest/src/include/gtest/gtest.h b/third_party/googletest/src/include/gtest/gtest.h index 26e787d99..456e4a849 100644 --- a/third_party/googletest/src/include/gtest/gtest.h +++ b/third_party/googletest/src/include/gtest/gtest.h @@ -1775,11 +1775,8 @@ class WithParamInterface { virtual ~WithParamInterface() {} // The current parameter value. Is also available in the test fixture's - // constructor. This member function is non-static, even though it only - // references static data, to reduce the opportunity for incorrect uses - // like writing 'WithParamInterface<bool>::GetParam()' for a test that - // uses a fixture whose parameter type is int. - const ParamType& GetParam() const { + // constructor. + static const ParamType& GetParam() { GTEST_CHECK_(parameter_ != NULL) << "GetParam() can only be called inside a value-parameterized test " << "-- did you intend to write TEST_P instead of TEST_F?"; |