diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-24 18:33:26 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-10-24 18:33:26 +0000 |
| commit | 97ef1c705eb24945cf4a2bca9eafe5357281703b (patch) | |
| tree | 9b4277be011483507f52b06b795d4a58528faf60 /test | |
| parent | c7c7961d2399de7d301f7d01451ffb10f859d1b4 (diff) | |
| download | googletest-97ef1c705eb24945cf4a2bca9eafe5357281703b.tar.gz googletest-97ef1c705eb24945cf4a2bca9eafe5357281703b.tar.bz2 googletest-97ef1c705eb24945cf4a2bca9eafe5357281703b.zip | |
Changes to fix gtest-printers_test on VC++ 2010.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest-printers_test.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/gtest-printers_test.cc b/test/gtest-printers_test.cc index 6292c7f2..58044ab5 100644 --- a/test/gtest-printers_test.cc +++ b/test/gtest-printers_test.cc @@ -197,6 +197,7 @@ using ::std::pair; using ::std::set; using ::std::vector; using ::testing::PrintToString; +using ::testing::internal::ImplicitCast_; using ::testing::internal::NativeArray; using ::testing::internal::RE; using ::testing::internal::Strings; @@ -1002,9 +1003,12 @@ TEST(PrintTupleTest, VariousSizes) { EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9)); const char* const str = "8"; + // VC++ 2010's implementation of tuple of C++0x is deficient, requiring + // an explicit type cast of NULL to be used. tuple<bool, char, short, testing::internal::Int32, // NOLINT testing::internal::Int64, float, double, const char*, void*, string> - t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str, NULL, "10"); + t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str, + ImplicitCast_<void*>(NULL), "10"); EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) + " pointing to \"8\", NULL, \"10\")", Print(t10)); |