Skip to content

GitLab

Commit a7269e24 authored by Bryan Zimmerman's avatar Bryan Zimmerman
Browse files

replaced back accidently removed static_cast with consistent ImplicitCast_

parent 530885cb
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
googletest/test/gtest-printers_test.cc
View file @ a7269e24
...@@ -1092,7 +1092,7 @@ TEST(PrintTr1TupleTest, VariousSizes) { ...@@ -1092,7 +1092,7 @@ TEST(PrintTr1TupleTest, VariousSizes) {
::std::tr1::tuple<bool, char, short, testing::internal::Int32, // NOLINT ::std::tr1::tuple<bool, char, short, testing::internal::Int32, // NOLINT
testing::internal::Int64, float, double, const char*, void*, testing::internal::Int64, float, double, const char*, void*,
std::string> std::string>
t10(false, 'a', 3, 4, 5, 1.5F, -2.5, str, ImplicitCast_<void*>(NULL), t10(false, 'a', ImplicitCast_<short>(3), 4, 5, 1.5F, -2.5, str, ImplicitCast_<void*>(NULL),
"10"); "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\")",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment