generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into missing-declarations

Browse Source
This commit is contained in:
Gennadiy Civil
2018-01-04 22:01:38 -05:00
committed by GitHub
parent b3d9be5c1d abbc0f8174
commit 6b4967a23a
28 changed files with 215 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
googlemock/test/gmock-internal-utils_test.cc
View File

@@ -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