commit 82cb322b7c1b7728726e2e3af159a29dcc0ba5c0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 13 11:42:50 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 13 11:42:50 2023 +0000
tree 89d54e1196cb40efe4449955cc5130ccc379d1af
parent fe7e4cb7669e7dfd11ecd9eb564172e5224218eb
parent 0de2bc802147e877e67329a586893e29404d2d51

Merge "Fix cast-function-type on windows" into main

src/base/thread_utils.cc

diff --git a/src/base/thread_utils.cc b/src/base/thread_utils.cc
index 086c587..5e18bdb 100644
--- a/src/base/thread_utils.cc
+++ b/src/base/thread_utils.cc
@@ -56,8 +56,9 @@
 bool MaybeSetThreadName(const std::string& name) {
   // The SetThreadDescription API works even if no debugger is attached.
   static auto set_thread_description_func =
-      reinterpret_cast<SetThreadDescription>(::GetProcAddress(
-          ::GetModuleHandleA("Kernel32.dll"), "SetThreadDescription"));
+      reinterpret_cast<SetThreadDescription>(
+          reinterpret_cast<void*>(::GetProcAddress(
+              ::GetModuleHandleA("Kernel32.dll"), "SetThreadDescription")));
   if (!set_thread_description_func) {
     return false;
   }
@@ -72,8 +73,9 @@
 
 bool GetThreadName(std::string& out_result) {
   static auto get_thread_description_func =
-      reinterpret_cast<GetThreadDescription>(::GetProcAddress(
-          ::GetModuleHandleA("Kernel32.dll"), "GetThreadDescription"));
+      reinterpret_cast<GetThreadDescription>(
+          reinterpret_cast<void*>(::GetProcAddress(
+              ::GetModuleHandleA("Kernel32.dll"), "GetThreadDescription")));
   if (!get_thread_description_func) {
     return false;
   }