diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-04 22:01:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 22:01:38 -0500 |
| commit | 6b4967a23aae2f6d63a356d1db8746cb5250be26 (patch) | |
| tree | e76ee1c2169a9551829d8fce649d393474d8dd2e /googlemock/test | |
| parent | b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9 (diff) | |
| parent | abbc0f8174d92b8a52dd893cf31be6f7af5d0de7 (diff) | |
| download | googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.tar.gz googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.tar.bz2 googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.zip | |
Merge branch 'master' into missing-declarations
Diffstat (limited to 'googlemock/test')
| -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 |