1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Mon, 30 May 2022 09:32:18 +0200
Subject: Fix for log4cxx 0.13
---
src/rosconsole/impl/rosconsole_log4cxx.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/rosconsole/impl/rosconsole_log4cxx.cpp b/src/rosconsole/impl/rosconsole_log4cxx.cpp
index 4c3b26e..5aae1ca 100644
--- a/src/rosconsole/impl/rosconsole_log4cxx.cpp
+++ b/src/rosconsole/impl/rosconsole_log4cxx.cpp
@@ -184,7 +184,11 @@ void print(void* handle, ::ros::console::Level level, const char* str, const cha
log4cxx::Logger* logger = (log4cxx::Logger*)handle;
try
{
+#ifdef LOG4CXX_VERSION_MAJOR
+ logger->forcedLog(g_level_lookup[level], str, log4cxx::spi::LocationInfo(file, log4cxx::spi::LocationInfo::calcShortFileName(file), function, line));
+#else
logger->forcedLog(g_level_lookup[level], str, log4cxx::spi::LocationInfo(file, function, line));
+#endif
}
catch (std::exception& e)
{
@@ -382,7 +386,7 @@ void shutdown()
//
// See https://code.ros.org/trac/ros/ticket/3271
//
- static_cast<log4cxx::spi::LoggerRepositoryPtr>(log4cxx::Logger::getRootLogger()->getLoggerRepository())->shutdown();
+ log4cxx::Logger::getRootLogger()->getLoggerRepository()->shutdown();
}
} // namespace impl
|
