Merge pull request #2417 from iguessthislldo/igtd/android-ace6

iguessthislldo · web-flow · commit 66be9d1ddf31 · 2025-07-07T13:40:45.000-05:00
[ace6tao2] Fixed building ACE for Android with `uses_wchar=1`
diff --git a/ACE/NEWS b/ACE/NEWS
@@ -3,6 +3,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.5.22 and ACE-6.5.23
 
 . Backported TTY_IO enhancements from ACE-7.x
 
+. Fixed building ACE for Android with `uses_wchar=1`
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.21 and ACE-6.5.22
 ======================================================
 
diff --git a/ACE/ace/Log_Msg_Android_Logcat.cpp b/ACE/ace/Log_Msg_Android_Logcat.cpp
@@ -72,7 +72,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
`@@ -72,7 +72,7 @@ ACE_Log_Msg_Android_Logcat::log (ACE_Log_Record &log_record)`
`72`	`72`	`__android_log_write (`
`73`	`73`	`convert_log_priority (static_cast<ACE_Log_Priority> (log_record.type ())),`
`74`	`74`	`"ACE",`
`75`		`- log_record.msg_data ());`
	`75`	`+ ACE_TEXT_ALWAYS_CHAR (log_record.msg_data ()));`
`76`	`76`	`return 0;`
`77`	`77`	`}`
`78`	`78`