diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-26 13:04:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 13:04:53 -0400 |
| commit | 6cacb41935a38069d85971c9193d4b7cca2681a3 (patch) | |
| tree | 00e5db2f87f90b9743c23b35af9278476ce08ed7 /googlemock/test | |
| parent | fd4f7cc7299e8fde91d45ba6685fbd99698814e0 (diff) | |
| parent | 40904f897048f26c7af0b199e31f8385c446fcf9 (diff) | |
| download | googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.tar.gz googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.tar.bz2 googletest-6cacb41935a38069d85971c9193d4b7cca2681a3.zip | |
Merge branch 'master' into deprecate
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) |