Merge pull request #2033 from meganz/hotfix/no_thread_local_until_we_…

…abandon_winXP With thread_local in use, the text appearing in MEGAsync on windows X…
meganz · Jun 3, 2020 · 610f41b · 610f41b
2 parents 29cc212 + fcbfd0e
commit 610f41b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/mega/logging.h b/include/mega/logging.h
@@ -201,8 +201,11 @@ class SimpleLogger
     static OutputStreams getOutput(enum LogLevel ll);
 #else
 
-#ifdef WIN32
+#ifdef WIN64
     static thread_local std::array<char, LOGGER_CHUNKS_SIZE> mBuffer;
+#elif WIN32
+    // Keep this as a normal class member on WIN32 until we abandon XP (Qt fonts appear with strikethrough on XP otherwise)
+    /*static thread_local*/ std::array<char, LOGGER_CHUNKS_SIZE> mBuffer;
 #else
     static __thread std::array<char, LOGGER_CHUNKS_SIZE> mBuffer;
 #endif

diff --git a/src/logging.cpp b/src/logging.cpp
@@ -44,8 +44,10 @@ long long SimpleLogger::maxPayloadLogSize  = 10240;
 
 #ifdef ENABLE_LOG_PERFORMANCE
 
-#ifdef WIN32
-thread_local std::array<char, LOGGER_CHUNKS_SIZE> SimpleLogger::mBuffer; 
+#ifdef WIN64
+thread_local std::array<char, LOGGER_CHUNKS_SIZE> SimpleLogger::mBuffer;
+#elif WIN32
+//thread_local std::array<char, LOGGER_CHUNKS_SIZE> SimpleLogger::mBuffer; 
 #else
 __thread std::array<char, LOGGER_CHUNKS_SIZE> SimpleLogger::mBuffer; 
 #endif