You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2020/09/27 22:48:23 UTC
[logging-log4cxx] branch master updated: fix build without wchar
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new 1fa70ea fix build without wchar
new f171f81 Merge pull request #42 from ffontaine/master
1fa70ea is described below
commit 1fa70eaf24d75e84625f22779ec347fd29bf1ae6
Author: Fabrice Fontaine <fo...@gmail.com>
AuthorDate: Thu Sep 24 08:47:37 2020 +0200
fix build without wchar
Disable wencode without wchar or the build will fail on:
odbcappender.cpp: In static member function 'static void log4cxx::db::ODBCAppender::encode(wchar_t**, const LogString&, log4cxx::helpers::Pool&)':
odbcappender.cpp:362:22: error: 'wencode' is not a member of 'log4cxx::helpers::Transcoder'
*dest = Transcoder::wencode(src, p);
^~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/bab5329fdeb894471bfd5192ce04d3fbd2f9be5c
Signed-off-by: Fabrice Fontaine <fo...@gmail.com>
---
src/main/cpp/odbcappender.cpp | 2 ++
src/main/include/log4cxx/db/odbcappender.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp
index 6bfa519..218df13 100644
--- a/src/main/cpp/odbcappender.cpp
+++ b/src/main/cpp/odbcappender.cpp
@@ -357,10 +357,12 @@ void ODBCAppender::setSql(const LogString& s)
}
}
+#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p)
{
*dest = Transcoder::wencode(src, p);
}
+#endif
void ODBCAppender::encode(unsigned short** dest,
const LogString& src, Pool& p)
diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h
index a26bc35..fdc144f 100644
--- a/src/main/include/log4cxx/db/odbcappender.h
+++ b/src/main/include/log4cxx/db/odbcappender.h
@@ -300,8 +300,10 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
private:
ODBCAppender(const ODBCAppender&);
ODBCAppender& operator=(const ODBCAppender&);
+#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
static void encode(wchar_t** dest, const LogString& src,
log4cxx::helpers::Pool& p);
+#endif
static void encode(unsigned short** dest, const LogString& src,
log4cxx::helpers::Pool& p);
}; // class ODBCAppender