diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-25 10:43:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 10:43:26 -0400 |
| commit | 40904f897048f26c7af0b199e31f8385c446fcf9 (patch) | |
| tree | 05d8aee6ef8a254b19978c5dada873be633f93f0 /googlemock | |
| parent | 78b49242d1def8c7fd884b81901f589c7b3d8db2 (diff) | |
| parent | ed1edf641dc5a04dc559df763ca71a5d6d05d939 (diff) | |
| download | googletest-40904f897048f26c7af0b199e31f8385c446fcf9.tar.gz googletest-40904f897048f26c7af0b199e31f8385c446fcf9.tar.bz2 googletest-40904f897048f26c7af0b199e31f8385c446fcf9.zip | |
Merge pull request #1684 from gennadiycivil/master
Formatting changes, code sync
Diffstat (limited to 'googlemock')
| -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) |