diff --git a/third_party/googletest/METADATA b/third_party/googletest/METADATA index 824e8b02..a696a87f 100644 --- a/third_party/googletest/METADATA +++ b/third_party/googletest/METADATA @@ -13,4 +13,5 @@ third_party { "Only googletest, not googlemock, is included." " " "https://github.com/google/googletest/pull/965 was applied." + "https://github.com/google/googletest/pull/991 was applied." } diff --git a/third_party/googletest/include/gtest/gtest-printers.h b/third_party/googletest/include/gtest/gtest-printers.h index 8a33164c..b7f81566 100644 --- a/third_party/googletest/include/gtest/gtest-printers.h +++ b/third_party/googletest/include/gtest/gtest-printers.h @@ -423,9 +423,9 @@ void DefaultPrintTo(IsNotContainer /* dummy */, // void*. However, we cannot cast it to const void* directly, // even using reinterpret_cast, as earlier versions of gcc // (e.g. 3.4.5) cannot compile the cast when p is a function - // pointer. Casting to UInt64 first solves the problem. + // pointer. Casting to UIntPtr first solves the problem. *os << reinterpret_cast( - reinterpret_cast(p)); + reinterpret_cast(p)); } } } diff --git a/third_party/googletest/include/gtest/internal/gtest-port.h b/third_party/googletest/include/gtest/internal/gtest-port.h index b55ebf97..8f128232 100644 --- a/third_party/googletest/include/gtest/internal/gtest-port.h +++ b/third_party/googletest/include/gtest/internal/gtest-port.h @@ -243,6 +243,7 @@ // TypeWithSize - maps an integer to a int type. // Int32, UInt32, Int64, UInt64, TimeInMillis // - integers of known sizes. +// UIntPtr - unsigned integer with the size of a pointer. // BiggestInt - the biggest signed integer type. // // Command-line utilities: @@ -2522,6 +2523,7 @@ typedef TypeWithSize<4>::Int Int32; typedef TypeWithSize<4>::UInt UInt32; typedef TypeWithSize<8>::Int Int64; typedef TypeWithSize<8>::UInt UInt64; +typedef TypeWithSize::UInt UIntPtr; typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. // Utilities for command line flags and environment variables.