diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
| commit | 6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/test/gmock-internal-utils_test.cc | |
| parent | 555e6e79485151cf8c8ada55d57d9ed872591dc5 (diff) | |
| parent | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (diff) | |
| download | googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.gz googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.bz2 googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.zip | |
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest 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 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 72d9a854..c7893ae2 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -44,15 +44,7 @@ #include "gmock/internal/gmock-port.h" #include "gtest/gtest.h" #include "gtest/gtest-spi.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_ #if GTEST_OS_CYGWIN # include <sys/types.h> // For ssize_t. NOLINT |