From 91424efae59d53ebe348fd858b7d2fd20074375f Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Wed, 5 Feb 2020 22:31:22 -0800 Subject: [PATCH] Add explicit casts to printing of function pointers (flutter/engine#16370) Compiling with clang on Windows fails here with a warning about implicit cast from function pointer to object pointer. Rather than disable that warning, this makes it an explicit cast. Since this is just test output, it's not critical that this be a completely safe operation. Part of #16256 --- .../platform/embedder/tests/embedder_assertions.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_assertions.h b/engine/src/flutter/shell/platform/embedder/tests/embedder_assertions.h index 99ff74d03e9..89faa037b20 100644 --- a/engine/src/flutter/shell/platform/embedder/tests/embedder_assertions.h +++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_assertions.h @@ -224,16 +224,16 @@ inline std::ostream& operator<<(std::ostream& out, const FlutterOpenGLTexture& item) { return out << "(FlutterOpenGLTexture) Target: 0x" << std::hex << item.target << std::dec << " Name: " << item.name << " Format: " << item.format - << " User Data: " << item.user_data - << " Destruction Callback: " << item.destruction_callback; + << " User Data: " << item.user_data << " Destruction Callback: " + << reinterpret_cast(item.destruction_callback); } inline std::ostream& operator<<(std::ostream& out, const FlutterOpenGLFramebuffer& item) { return out << "(FlutterOpenGLFramebuffer) Target: 0x" << std::hex << item.target << std::dec << " Name: " << item.name - << " User Data: " << item.user_data - << " Destruction Callback: " << item.destruction_callback; + << " User Data: " << item.user_data << " Destruction Callback: " + << reinterpret_cast(item.destruction_callback); } inline std::string FlutterPlatformViewMutationTypeToString( @@ -318,8 +318,8 @@ inline std::ostream& operator<<(std::ostream& out, const FlutterSoftwareBackingStore& item) { return out << "(FlutterSoftwareBackingStore) Allocation: " << item.allocation << " Row Bytes: " << item.row_bytes << " Height: " << item.height - << " User Data: " << item.user_data - << " Destruction Callback: " << item.destruction_callback; + << " User Data: " << item.user_data << " Destruction Callback: " + << reinterpret_cast(item.destruction_callback); } inline std::ostream& operator<<(std::ostream& out,