diff options
| author | Tanzinul Islam <tanzislam@users.noreply.github.com> | 2017-11-19 20:17:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 20:17:46 +0000 |
| commit | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (patch) | |
| tree | 778e7ffd3bfda62cd3be3e01a2d0207d5ffe1d82 /googlemock/test/gmock-internal-utils_test.cc | |
| parent | 78b1ff074799c776f90a77203fcd7adc98e11736 (diff) | |
| parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
| download | googletest-4ba3803f936a2f432e60841bc9358ea2f3a951eb.tar.gz googletest-4ba3803f936a2f432e60841bc9358ea2f3a951eb.tar.bz2 googletest-4ba3803f936a2f432e60841bc9358ea2f3a951eb.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/test/gmock-internal-utils_test.cc')
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 9c2423ec..72d9a854 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -49,7 +49,7 @@ // implementation. It must come before gtest-internal-inl.h is // included, or there will be a compiler error. This trick is to // prevent a user from accidentally including gtest-internal-inl.h in -// his code. +// their code. #define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" #undef GTEST_IMPLEMENTATION_ |