eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes to fix gtest-printers_test on VC++ 2010.

Browse Source
This commit is contained in:
vladlosev 2011-10-24 18:33:26 +00:00
parent c7c7961d23
commit 97ef1c705e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/gtest-printers_test.cc
View File

@ -197,6 +197,7 @@ using ::std::pair;
using ::std::set; using ::std::set;
using ::std::vector; using ::std::vector;
using ::testing::PrintToString; using ::testing::PrintToString;
using ::testing::internal::ImplicitCast_;
using ::testing::internal::NativeArray; using ::testing::internal::NativeArray;
using ::testing::internal::RE; using ::testing::internal::RE;
using ::testing::internal::Strings; using ::testing::internal::Strings;
@ -1002,9 +1003,12 @@ TEST(PrintTupleTest, VariousSizes) {
EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9)); EXPECT_EQ("(false, 2, 3, 4, true, 6, 7, true, 9)", Print(t9));
const char* const str = "8"; 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 tuple<bool, char, short, testing::internal::Int32, // NOLINT
testing::internal::Int64, float, double, const char*, void*, string> 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) + EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) +
" pointing to \"8\", NULL, \"10\")", " pointing to \"8\", NULL, \"10\")",
Print(t10)); Print(t10));