diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-26 12:22:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 12:22:48 -0500 |
| commit | 718fd88d8f145c63b8cc134cf8fed92743cc112f (patch) | |
| tree | 2a2f28e60798824956dc46fb7c89e1e35ee2a8de /googlemock/test/gmock_stress_test.cc | |
| parent | cb7271697bca56802db773f1b9a92fdaed5b7eee (diff) | |
| parent | 92c93802e13e84f4d916f45dd99417cdeb38841b (diff) | |
| download | googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.tar.gz googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.tar.bz2 googletest-718fd88d8f145c63b8cc134cf8fed92743cc112f.zip | |
Merge pull request #1429 from gennadiycivil/master
Code merges
Diffstat (limited to 'googlemock/test/gmock_stress_test.cc')
| -rw-r--r-- | googlemock/test/gmock_stress_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc index c16badda..b9fdc45c 100644 --- a/googlemock/test/gmock_stress_test.cc +++ b/googlemock/test/gmock_stress_test.cc @@ -33,12 +33,13 @@ // threads concurrently. #include "gmock/gmock.h" + #include "gtest/gtest.h" namespace testing { namespace { -// From <gtest/internal/gtest-port.h>. +// From "gtest/internal/gtest-port.h". using ::testing::internal::ThreadWithParam; // The maximum number of test threads (not including helper threads) |