diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-04 12:17:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-04 12:17:46 -0500 |
commit | be6ee26a9b5b814c3e173c6e5e97c385fbdc1fb0 (patch) | |
tree | 5c66bb3d15a199fb2057f775592aaa1ade2edf34 /googletest/test/gtest_output_test_.cc | |
parent | a5014476f0c49c966e4ac602469cddefc7ed486d (diff) | |
parent | 4216f869f77bc3733ccf734f2941fd3a601d0077 (diff) | |
download | googletest-be6ee26a9b5b814c3e173c6e5e97c385fbdc1fb0.tar.gz googletest-be6ee26a9b5b814c3e173c6e5e97c385fbdc1fb0.tar.bz2 googletest-be6ee26a9b5b814c3e173c6e5e97c385fbdc1fb0.zip |
Merge pull request #1378 from gennadiycivil/master
upstreaming cl 124976692
Diffstat (limited to 'googletest/test/gtest_output_test_.cc')
-rw-r--r-- | googletest/test/gtest_output_test_.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/googletest/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc index 0856cc7c..6aaba977 100644 --- a/googletest/test/gtest_output_test_.cc +++ b/googletest/test/gtest_output_test_.cc @@ -37,15 +37,7 @@ #include "gtest/gtest-spi.h" #include "gtest/gtest.h" - -// Indicates that this translation unit is part of Google Test's -// 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 -// their code. -#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION_ #include <stdlib.h> |