You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2005/04/29 18:03:11 UTC
cvs commit: logging-log4cxx/src charsetdecoder.cpp charsetencoder.cpp
carnold 2005/04/29 09:03:11
Modified: src charsetdecoder.cpp charsetencoder.cpp
Log:
LOGCXX-59: Forgot to guard implementation of some wchar_t methods
Revision Changes Path
1.6 +1 -1 logging-log4cxx/src/charsetdecoder.cpp
Index: charsetdecoder.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/charsetdecoder.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- charsetdecoder.cpp 28 Apr 2005 23:43:21 -0000 1.5
+++ charsetdecoder.cpp 29 Apr 2005 16:03:11 -0000 1.6
@@ -360,7 +360,7 @@
};
-#if LOG4CXX_LOGCHAR_IS_UTF8
+#if LOG4CXX_LOGCHAR_IS_UTF8 && LOG4CXX_HAS_WCHAR_T
/**
* Decoder to convert array of wchar_t to UTF-8 bytes.
*
1.6 +2 -1 logging-log4cxx/src/charsetencoder.cpp
Index: charsetencoder.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/charsetencoder.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- charsetencoder.cpp 28 Apr 2005 23:26:33 -0000 1.5
+++ charsetencoder.cpp 29 Apr 2005 16:03:11 -0000 1.6
@@ -475,7 +475,7 @@
#endif
}
-
+#if LOG4CXX_HAS_WCHAR_T
CharsetEncoderPtr CharsetEncoder::getEncoder(const std::wstring& charset) {
std::string cs(charset.size(), ' ');
for(std::wstring::size_type i = 0;
@@ -485,6 +485,7 @@
}
return getEncoder(cs);
}
+#endif
#if LOG4CXX_HAS_WCHAR_T