diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-02 10:54:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 10:54:26 -0500 |
| commit | fa6730103ecaad750f42700c55a92c3e212a9271 (patch) | |
| tree | 3c9e1638dc96dfe918b73e87d4b389d3bbe5dd86 /googlemock/test/gmock-internal-utils_test.cc | |
| parent | ca6a70c6082ff526b993c622d192c6d519800bc2 (diff) | |
| parent | 1c2f1907047216654599b0057df49d21a2c1400a (diff) | |
| download | googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.gz googletest-fa6730103ecaad750f42700c55a92c3e212a9271.tar.bz2 googletest-fa6730103ecaad750f42700c55a92c3e212a9271.zip | |
Merge branch 'master' into uintptr
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_ |