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/include/gmock/gmock-matchers.h | |
| parent | b3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff) | |
| download | googletest-fbb48a7708fc791ef25096b383791966bbf369f0.zip googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.gz googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.bz2 | |
Code merges
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 3367a0b..41bf6de 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -47,10 +47,9 @@ #include <string> #include <utility> #include <vector> - +#include "gtest/gtest.h" #include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-port.h" -#include "gtest/gtest.h" #if GTEST_HAS_STD_INITIALIZER_LIST_ # include <initializer_list> // NOLINT -- must be after gtest.h |