diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-01 12:11:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 12:11:18 +0200 |
| commit | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (patch) | |
| tree | bf36edd43dcaca6e9588c9c02bcc70527d11c871 /googlemock/test | |
| parent | 1ae4fdb79009322d90c304fd49d4fb625b408823 (diff) | |
| parent | 4f160f737078a827f1702e69b5964322ac860598 (diff) | |
| download | googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.tar.gz googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.tar.bz2 googletest-25e1436b087ac2b05a4b5eeb0a2704a53016be2d.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock_stress_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc index b9fdc45c..e4e61f0f 100644 --- a/googlemock/test/gmock_stress_test.cc +++ b/googlemock/test/gmock_stress_test.cc @@ -33,13 +33,12 @@ // threads concurrently. #include "gmock/gmock.h" - #include "gtest/gtest.h" namespace testing { namespace { -// From "gtest/internal/gtest-port.h". +// From gtest-port.h. using ::testing::internal::ThreadWithParam; // The maximum number of test threads (not including helper threads) |