Wind back the optimization in PR #235

stephen-webb · stephen-webb · commit 11a2caf28422 · 2023-08-15T18:29:09.000+10:00
diff --git a/src/main/include/log4cxx/helpers/transcoder.h b/src/main/include/log4cxx/helpers/transcoder.h
@@ -192,7 +192,7 @@ class LOG4CXX_EXPORT Transcoder
 }
 }
 
-#if LOG4CXX_LOGCHAR_IS_UTF8
+#if LOG4CXX_CHARSET_UTF8 && LOG4CXX_LOGCHAR_IS_UTF8
 
 #define LOG4CXX_ENCODE_CHAR(var, src) \
 	const std::string& var = src

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ class LOG4CXX_EXPORT Transcoder`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
`195`		`-#if LOG4CXX_LOGCHAR_IS_UTF8`
	`195`	`+#if LOG4CXX_CHARSET_UTF8 && LOG4CXX_LOGCHAR_IS_UTF8`
`196`	`196`
`197`	`197`	`#define LOG4CXX_ENCODE_CHAR(var, src) \`
`198`	`198`	`const std::string& var = src`