[logging-log4cxx] branch LOGCXX-567 updated: fix compile error when no stacktrace

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a commit to branch LOGCXX-567
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/LOGCXX-567 by this push:
     new 7558a54d fix compile error when no stacktrace
7558a54d is described below

commit 7558a54d4b9b10699e1a4c6661eff1225f4800ea
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Thu Dec 15 21:29:41 2022 -0500

    fix compile error when no stacktrace
---
 src/main/cpp/logger.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/cpp/logger.cpp b/src/main/cpp/logger.cpp
index 8233ce65..94e9dd64 100644
--- a/src/main/cpp/logger.cpp
+++ b/src/main/cpp/logger.cpp
@@ -165,20 +165,22 @@ void Logger::forcedLog(const LevelPtr& level1, const std::string& message,
 		return;
 	Pool p;
 	LOG4CXX_DECODE_CHAR(msg, message);
+	LoggingEventPtr event;
 #if LOG4CXX_HAS_BOOST_STACKTRACE
 	auto it = optionalParams.m_builderParams.find(OptionalLogParams::ParameterType::BoostStacktrace);
 	const boost::stacktrace::stacktrace* stacktrace = nullptr;
 	if( it != optionalParams.m_builderParams.end() ){
 		stacktrace = static_cast<const boost::stacktrace::stacktrace*>(it->second);
 	}
-#endif
-	LoggingEventPtr event;
-
 	if(stacktrace){
 		event = std::make_shared<LoggingEvent>(m_priv->name, level1, msg, location, *stacktrace);
 	}else{
 		event = std::make_shared<LoggingEvent>(m_priv->name, level1, msg, location);
 	}
+#else
+	event = std::make_shared<LoggingEvent>(m_priv->name, level1, msg, location);
+#endif
+
 	callAppenders(event, p);
 }
 
@@ -709,20 +711,21 @@ void Logger::forcedLog(const LevelPtr& level1, const std::wstring& message,
 		return;
 	Pool p;
 	LOG4CXX_DECODE_WCHAR(msg, message);
+	LoggingEventPtr event;
 #if LOG4CXX_HAS_BOOST_STACKTRACE
 	auto it = optionalParams.m_builderParams.find(OptionalLogParams::ParameterType::BoostStacktrace);
 	const boost::stacktrace::stacktrace* stacktrace = nullptr;
 	if( it != optionalParams.m_builderParams.end() ){
 		stacktrace = static_cast<const boost::stacktrace::stacktrace*>(it->second);
 	}
-#endif
-	LoggingEventPtr event;
-
 	if(stacktrace){
 		event = std::make_shared<LoggingEvent>(m_priv->name, level1, msg, location, *stacktrace);
 	}else{
 		event = std::make_shared<LoggingEvent>(m_priv->name, level1, msg, location);
 	}
+#else
+	event = std::make_shared<LoggingEvent>(m_priv->name, level1, msg, location);
+#endif
 	callAppenders(event, p);
 }