diff options
| author | Gaspard Petit <gaspard.petit@eidosmontreal.com> | 2018-01-09 15:22:30 -0500 |
|---|---|---|
| committer | Gaspard Petit <gaspard.petit@eidosmontreal.com> | 2018-01-09 15:22:30 -0500 |
| commit | 5d96565ccc4b5bbd72100729361516de79b61353 (patch) | |
| tree | 93aa8a57b1f8015974c44a6e5ec5efa8d69ddbab /googlemock/test/gmock-internal-utils_test.cc | |
| parent | 8b491162f79282b79292e0f4166194b3f7ccb7b1 (diff) | |
| parent | 23015249236e60b94b5010330ef687de43d2e923 (diff) | |
| download | googletest-5d96565ccc4b5bbd72100729361516de79b61353.tar.gz googletest-5d96565ccc4b5bbd72100729361516de79b61353.tar.bz2 googletest-5d96565ccc4b5bbd72100729361516de79b61353.zip | |
Merge branch 'master' into support_xboxone
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 9c2423ec..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 -// his 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 |