diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-18 11:38:08 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-18 11:38:08 -0500 |
commit | a7bd3725f08fe38374544bbf8f03699fc0d32a0b (patch) | |
tree | 09510ad34eef68866ade872c73640ccef268cc48 /googletest/test/gtest_output_test_.cc | |
parent | 79cdf971fbf8f1efb1573df97bcc6f5e8ef3215a (diff) | |
parent | 1865ecaf1779c2a2f210ca3768aa030206ef74ba (diff) | |
download | googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.tar.gz googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.tar.bz2 googletest-a7bd3725f08fe38374544bbf8f03699fc0d32a0b.zip |
Merge branch 'master' into bazel
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
-rw-r--r-- | googletest/test/gtest_output_test_.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc index 1070a9f2..e5fa764e 100644 --- a/googletest/test/gtest_output_test_.cc +++ b/googletest/test/gtest_output_test_.cc @@ -42,7 +42,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_ |