diff options
| author | Bryan Zimmerman <BryanZim@bazinnovations.com> | 2017-11-22 09:40:48 -0500 |
|---|---|---|
| committer | Bryan Zimmerman <BryanZim@bazinnovations.com> | 2017-11-22 09:41:32 -0500 |
| commit | a7269e24acaa3fe301c1fc34a56a1012a45f77b9 (patch) | |
| tree | 35ed1c201ed089ee613dbe562e637ee015999091 | |
| parent | 530885cbd5b4bc92598050b59a3070eb7a404b4f (diff) | |
| download | googletest-a7269e24acaa3fe301c1fc34a56a1012a45f77b9.tar.gz googletest-a7269e24acaa3fe301c1fc34a56a1012a45f77b9.tar.bz2 googletest-a7269e24acaa3fe301c1fc34a56a1012a45f77b9.zip | |
replaced back accidently removed static_cast with consistent ImplicitCast_
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc index d922ba69..a48489c0 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -1092,7 +1092,7 @@ TEST(PrintTr1TupleTest, VariousSizes) { ::std::tr1::tuple<bool, char, short, testing::internal::Int32, // NOLINT testing::internal::Int64, float, double, const char*, void*, 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"); EXPECT_EQ("(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, " + PrintPointer(str) + " pointing to \"8\", NULL, \"10\")", |