diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-01-12 16:00:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 16:00:39 +0000 |
| commit | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (patch) | |
| tree | e8cca8f555358fa2ed590a226c8a15a0354dbd80 /googlemock/test/gmock-internal-utils_test.cc | |
| parent | 8f90d46c8cdd743759821a1c987a70e826d58cef (diff) | |
| parent | ed8d02cfc689f26b65e6deb585561c59615b05de (diff) | |
| download | googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.gz googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.bz2 googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.zip | |
Merge branch 'master' into fix-argc
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 |