summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrii Kalinich <AKalinich@luxoft.com>2021-10-21 22:59:57 -0400
committerAndrii Kalinich <AKalinich@luxoft.com>2021-10-21 22:59:57 -0400
commit3a49a0e97f67a60c02022a5e5a0cd14319597c73 (patch)
tree095940646fd10d42662516aff0fe2d6db182cec1
parentc3bc8954f5a39069e3dc794d54ac7b656a7028ef (diff)
downloadsdl_core-3a49a0e97f67a60c02022a5e5a0cd14319597c73.tar.gz
Fix logger static assertion for Android
-rw-r--r--src/components/utils/src/logger/logger_impl.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/components/utils/src/logger/logger_impl.cc b/src/components/utils/src/logger/logger_impl.cc
index 1439f7327a..4019220ec3 100644
--- a/src/components/utils/src/logger/logger_impl.cc
+++ b/src/components/utils/src/logger/logger_impl.cc
@@ -36,6 +36,8 @@
namespace logger {
+Logger* Logger::instance_ = nullptr;
+
LoggerImpl::LoggerImpl(bool use_message_loop_thread)
: impl_(nullptr), use_message_loop_thread_(use_message_loop_thread) {}
@@ -68,6 +70,8 @@ void LoggerImpl::DeInit() {
if (impl_) {
impl_->DeInit();
}
+
+ instance_ = nullptr;
}
void LoggerImpl::Flush() {
@@ -96,7 +100,6 @@ void LoggerImpl::PushLog(const LogMessage& log_message) {
}
Logger& Logger::instance(Logger* pre_init) {
- static Logger* instance_;
if (pre_init) {
assert(instance_ == nullptr);
instance_ = pre_init;