svn commit: r639525 - in /logging/log4cxx/trunk/src: changes/changes.xml main/cpp/transcoder.cpp

[carnold]

Author: carnold
Date: Thu Mar 20 19:47:20 2008
New Revision: 639525

URL: http://svn.apache.org/viewvc?rev=639525&view=rev
Log:
LOGCXX-253: Transcoder compilation error with utf-8 charset

Modified:
    logging/log4cxx/trunk/src/changes/changes.xml
    logging/log4cxx/trunk/src/main/cpp/transcoder.cpp

Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?rev=639525&r1=639524&r2=639525&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Thu Mar 20 19:47:20 2008
@@ -221,6 +221,7 @@
 <action issue="LOGCXX-248">ODBCAppender has unicode issues</action>
 <action issue="LOGCXX-251">NDC::cloneStack and NDC::inherit missing in 0.10.0 
RC2</action>
 <action issue="LOGCXX-252">Add documentation for use of operator&lt;&lt; in 
logging requests</action>
+<action issue="LOGCXX-253">Transcoder compilation error with utf-8 
charset</action>
 </release>
 <release version="0.9.7" date="2004-05-10">
 <action type="fix">Fixed examples source code in the "Short introduction to 
log4cxx".</action>

Modified: logging/log4cxx/trunk/src/main/cpp/transcoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/transcoder.cpp?rev=639525&r1=639524&r2=639525&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/transcoder.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/transcoder.cpp Thu Mar 20 19:47:20 2008
@@ -271,12 +271,12 @@
 
 char* Transcoder::encode(const LogString& src, Pool& p) {
 #if LOG4CXX_CHARSET_UTF8 && LOG4CXX_LOGCHAR_IS_UTF8
-   std::string& tmp = src;
+   return p.pstrdup(src);
 #else
    std::string tmp;
    encode(src, tmp);
-#endif
    return p.pstrdup(tmp);
+#endif
 }