Merge pull request #2416 from iguessthislldo/igtd/android

iguessthislldo · web-flow · commit d47df969598a · 2025-07-07T13:41:00.000-05:00
Fixed building ACE for Android with `uses_wchar=1`
diff --git a/ACE/NEWS b/ACE/NEWS
@@ -1,6 +1,8 @@
 USER VISIBLE CHANGES BETWEEN ACE-8.0.4 and ACE-8.0.5
 ====================================================
 
+. Fixed building ACE for Android with `uses_wchar=1`
+
 USER VISIBLE CHANGES BETWEEN ACE-8.0.3 and ACE-8.0.4
 ====================================================
 
diff --git a/ACE/ace/Log_Msg_Android_Logcat.cpp b/ACE/ace/Log_Msg_Android_Logcat.cpp
@@ -68,7 +68,7 @@ ACE_Log_Msg_Android_Logcat::log (ACE_Log_Record &log_record)
   __android_log_write (
     convert_log_priority (static_cast<ACE_Log_Priority> (log_record.type ())),
     "ACE",
-    log_record.msg_data ());
+    ACE_TEXT_ALWAYS_CHAR (log_record.msg_data ()));
   return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ ACE_Log_Msg_Android_Logcat::log (ACE_Log_Record &log_record)`
`68`	`68`	`__android_log_write (`
`69`	`69`	`convert_log_priority (static_cast<ACE_Log_Priority> (log_record.type ())),`
`70`	`70`	`"ACE",`
`71`		`- log_record.msg_data ());`
	`71`	`+ ACE_TEXT_ALWAYS_CHAR (log_record.msg_data ()));`
`72`	`72`	`return 0;`
`73`	`73`	`}`
`74`	`74`