diff options
| author | Bryan Zimmerman <BryanZim@bazinnovations.com> | 2017-10-27 14:01:16 -0400 |
|---|---|---|
| committer | Bryan Zimmerman <BryanZim@bazinnovations.com> | 2017-10-27 14:01:16 -0400 |
| commit | 1ae4096b9c5de4429663e6b0c09bf00e5fb46b16 (patch) | |
| tree | d47ac0a6cb2beaff884a5b33c614c7a5f14a093e /googletest/test/gtest-printers_test.cc | |
| parent | 3121b2049e30d2579c03f841caf4049a2c45cdcd (diff) | |
| download | googletest-1ae4096b9c5de4429663e6b0c09bf00e5fb46b16.tar.gz googletest-1ae4096b9c5de4429663e6b0c09bf00e5fb46b16.tar.bz2 googletest-1ae4096b9c5de4429663e6b0c09bf00e5fb46b16.zip | |
fix for VS2017 deprecation of ::tr1::tuple
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
Diffstat (limited to 'googletest/test/gtest-printers_test.cc')
| -rw-r--r-- | googletest/test/gtest-printers_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc index 2a6c017e..d922ba69 100644 --- a/googletest/test/gtest-printers_test.cc +++ b/googletest/test/gtest-printers_test.cc @@ -1092,8 +1092,8 @@ 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', static_cast<short>(3), 4, 5, 1.5F, -2.5, str, - ImplicitCast_<void*>(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)); @@ -1152,7 +1152,7 @@ TEST(PrintStdTupleTest, VariousSizes) { ::std::tuple<bool, char, short, testing::internal::Int32, // NOLINT testing::internal::Int64, float, double, const char*, void*, std::string> - t10(false, 'a', static_cast<short>(3), 4, 5, 1.5F, -2.5, str, + 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\")", |