Merge pull request #2254 from chaoran:master

PiperOrigin-RevId: 248759825
2019-05-17 15:05:43 -04:00
parent 9d4cde44a4 5b4a135f62
commit 03273a8982
3 changed files with 63 additions and 75 deletions
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -151,9 +151,10 @@ class TypeWithoutFormatter {
 public:
  // This default version is called when kTypeKind is kOtherType.
  static void PrintValue(const T& value, ::std::ostream* os) {
-    PrintBytesInObjectTo(static_cast<const unsigned char*>(
-                             reinterpret_cast<const void*>(&value)),
-                         sizeof(value), os);
+    PrintBytesInObjectTo(
+        static_cast<const unsigned char*>(
+            reinterpret_cast<const void*>(std::addressof(value))),
+        sizeof(value), os);
  }
 };