diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-20 10:18:05 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-20 10:18:05 -0800 |
| commit | 0ddac1f3791efefb2cffdb425f0c600feb7a47e6 (patch) | |
| tree | efeab8fb69198186f1dabfe43d341c7b70c9c5f1 /gtest/test/gtest_color_test_.cc | |
| parent | 77a6b2f4cdd580d57630f079db1d908d7fd90a54 (diff) | |
| download | external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.zip external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.tar.gz external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.tar.bz2 | |
Update protobuf's gtest to expected version.
Generated by running:
rm -rf gtest
./autogen.sh
./configure
Change-Id: I5d9c0bea09dd9d3e4d7d4442dd8222011f5c522a
Diffstat (limited to 'gtest/test/gtest_color_test_.cc')
| -rw-r--r-- | gtest/test/gtest_color_test_.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gtest/test/gtest_color_test_.cc b/gtest/test/gtest_color_test_.cc index 305aeb9..58d377c 100644 --- a/gtest/test/gtest_color_test_.cc +++ b/gtest/test/gtest_color_test_.cc @@ -37,11 +37,14 @@ #include <gtest/gtest.h> -namespace testing { -namespace internal { -bool ShouldUseColor(bool stdout_is_tty); -} // namespace internal -} // namespace testing +// 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_ using testing::internal::ShouldUseColor; |