diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-01-26 16:57:58 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-01-26 16:57:58 (GMT) |
| commit | fbb48a7708fc791ef25096b383791966bbf369f0 (patch) | |
| tree | 06f49b8bef466973da1f715f658d9470af7aa263 /googlemock/test/gmock_stress_test.cc | |
| parent | b3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff) | |
| download | googletest-fbb48a7708fc791ef25096b383791966bbf369f0.zip googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.gz googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.bz2 | |
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 c16badd..b9fdc45 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) |