diff options
Diffstat (limited to 'googletest/test/googletest-printers-test.cc')
-rw-r--r-- | googletest/test/googletest-printers-test.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc index cebd6ac..58be7d1 100644 --- a/googletest/test/googletest-printers-test.cc +++ b/googletest/test/googletest-printers-test.cc @@ -83,12 +83,10 @@ void PrintTo(EnumWithPrintTo e, std::ostream* os) { *os << (e == kEWPT1 ? "kEWPT1" : "invalid"); } -// A class implicitly convertible to std::intmax_t. -class IntMaxConvertible { +// A class implicitly convertible to BiggestInt. +class BiggestIntConvertible { public: - constexpr operator std::intmax_t() const { // NOLINT(runtime/explicit) - return 42; - } + operator ::testing::internal::BiggestInt() const { return 42; } }; // A user-defined unprintable class template in the global namespace. @@ -269,10 +267,10 @@ TEST(PrintEnumTest, EnumWithPrintTo) { EXPECT_EQ("invalid", Print(static_cast<EnumWithPrintTo>(0))); } -// Tests printing a class implicitly convertible to std::intmax_t. +// Tests printing a class implicitly convertible to BiggestInt. -TEST(PrintClassTest, IntMaxConvertible) { - EXPECT_EQ("42", Print(IntMaxConvertible())); +TEST(PrintClassTest, BiggestIntConvertible) { + EXPECT_EQ("42", Print(BiggestIntConvertible())); } // Tests printing various char types. @@ -527,9 +525,10 @@ TEST(PrintPointerTest, NonMemberFunctionPointer) { // standard disallows casting between pointers to functions and // pointers to objects, and some compilers (e.g. GCC 3.4) enforce // this limitation. - EXPECT_EQ(PrintPointer(reinterpret_cast<const void*>( - reinterpret_cast<std::intptr_t>(&MyFunction))), - Print(&MyFunction)); + EXPECT_EQ( + PrintPointer(reinterpret_cast<const void*>( + reinterpret_cast<internal::BiggestInt>(&MyFunction))), + Print(&MyFunction)); int (*p)(bool) = NULL; // NOLINT EXPECT_EQ("NULL", Print(p)); } @@ -1121,8 +1120,8 @@ TEST(PrintReferenceTest, HandlesFunctionPointer) { // standard disallows casting between pointers to functions and // pointers to objects, and some compilers (e.g. GCC 3.4) enforce // this limitation. - const std::string fp_string = PrintPointer( - reinterpret_cast<const void*>(reinterpret_cast<std::intptr_t>(fp))); + const std::string fp_string = PrintPointer(reinterpret_cast<const void*>( + reinterpret_cast<internal::BiggestInt>(fp))); EXPECT_EQ("@" + fp_pointer_string + " " + fp_string, PrintByRef(fp)); } |