summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kutsan <akutsan@luxoft.com>2019-07-05 10:55:39 +0300
committerAlexander Kutsan <akutsan@luxoft.com>2019-07-05 11:23:41 +0300
commit9d6516d2aeaf5febcc2d7a66905e22592a7f3312 (patch)
treea81304c6366cb7c95374c0ab2de1bbb5f10e195d
parent87a1df63b38223bc4e0d3994c68184253133f2e1 (diff)
downloadsdl_core-fix/startup_crash_static_var_colission.tar.gz
Put logs_enabled_ "default" visibility attributefix/startup_crash_static_var_colission
Logs enables is static variable and it should be shared across libraries. On SDL start if set_enabled_logs should put value shared across libraries
-rw-r--r--src/components/utils/src/push_log.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/components/utils/src/push_log.cc b/src/components/utils/src/push_log.cc
index 6e16c99181..b310cd876f 100644
--- a/src/components/utils/src/push_log.cc
+++ b/src/components/utils/src/push_log.cc
@@ -36,7 +36,11 @@
namespace logger {
-static bool logs_enabled_ = false;
+struct __attribute__((visibility("default"))) LogsEnabled {
+ static bool logs_enabled_;
+};
+
+bool LogsEnabled::logs_enabled_ = false;
static LogMessageLoopThread* log_message_loop_thread = NULL;
bool push_log(log4cxx::LoggerPtr logger,
@@ -73,11 +77,11 @@ bool push_log(log4cxx::LoggerPtr logger,
}
bool logs_enabled() {
- return logs_enabled_;
+ return LogsEnabled::logs_enabled_;
}
void set_logs_enabled(bool state) {
- logs_enabled_ = state;
+ LogsEnabled::logs_enabled_ = state;
}
void create_log_message_loop_thread() {