diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-23 23:21:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 23:21:02 (GMT) |
| commit | f1a87d73fc604c5ab8fbb0cc6fa9a86ffd845530 (patch) | |
| tree | a3aec7458e35fcc3d7dddecd2fbb1c592baa7b3a | |
| parent | bfc0ffc8a698072c794ae7299db9cb6866f4c0bc (diff) | |
| parent | 89f45180e02cf04b2b044ffc19f5ca8f599fb438 (diff) | |
| download | googletest-f1a87d73fc604c5ab8fbb0cc6fa9a86ffd845530.zip googletest-f1a87d73fc604c5ab8fbb0cc6fa9a86ffd845530.tar.gz googletest-f1a87d73fc604c5ab8fbb0cc6fa9a86ffd845530.tar.bz2 | |
Merge pull request #1249 from stkhapugin/master
Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
| -rw-r--r-- | googletest/include/gtest/gtest-printers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index fba7661..282a2da 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -137,7 +137,8 @@ class TypeWithoutFormatter { public: // This default version is called when kTypeKind is kOtherType. static void PrintValue(const T& value, ::std::ostream* os) { - PrintBytesInObjectTo(reinterpret_cast<const unsigned char*>(&value), + PrintBytesInObjectTo(static_cast<const unsigned char*>( + reinterpret_cast<const void *>(&value)), sizeof(value), os); } }; |