diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-01 16:41:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 16:41:53 -0500 |
| commit | 9e236748fb7c9e0d29cdcae0a9f4e1c062838f48 (patch) | |
| tree | 1d961a5f52067643ace2651fd3aa8dfbf965e225 /googlemock/test/gmock-internal-utils_test.cc | |
| parent | 4d26df729c4172a4786fb4ca509a264dfd9b89dc (diff) | |
| parent | 247a3d8e5e5d403f7fcacdb8ccc71e5059f15daa (diff) | |
| download | googletest-9e236748fb7c9e0d29cdcae0a9f4e1c062838f48.tar.gz googletest-9e236748fb7c9e0d29cdcae0a9f4e1c062838f48.tar.bz2 googletest-9e236748fb7c9e0d29cdcae0a9f4e1c062838f48.zip | |
Merge branch 'master' into master
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_ |