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/samples/sample8_unittest.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/samples/sample8_unittest.cc')
-rw-r--r-- | gtest/samples/sample8_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtest/samples/sample8_unittest.cc b/gtest/samples/sample8_unittest.cc index d76136a..ccf61d9 100644 --- a/gtest/samples/sample8_unittest.cc +++ b/gtest/samples/sample8_unittest.cc @@ -162,12 +162,12 @@ INSTANTIATE_TEST_CASE_P(MeaningfulTestParameters, #else -// Google Test doesn't support Combine() on some platforms and compilers, -// such as MSVC 7.1. If we use conditional compilation to compile out -// all code referring to the gtest_main library, MSVC linker will not -// link that library at all and consequently complain about missing entry -// point defined in that library (fatal error LNK1561: entry point must -// be defined). This dummy test keeps gtest_main linked in. +// Google Test may not support Combine() with some compilers. If we +// use conditional compilation to compile out all code referring to +// the gtest_main library, MSVC linker will not link that library at +// all and consequently complain about missing entry point defined in +// that library (fatal error LNK1561: entry point must be +// defined). This dummy test keeps gtest_main linked in. TEST(DummyTest, CombineIsNotSupportedOnThisPlatform) {} #endif // GTEST_HAS_COMBINE |