[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/tool/interpr1.cxx |    2 --
 sc/source/core/tool/interpr4.cxx |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7a761c0ae392ed122cee689adc5a006996539dc0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 29 13:00:39 2017 +0300

    Try to work around GCC 4.8.1 problem
    
    Move the definition of the static thread_local members of
    ScInterpreter to the source file where its constructor is. Also, the
    only users of those members are in that file, so it is logically a
    better place anyway.
    
    Change-Id: I651b15abc83cc49edebbe8e3f982c3b3e6cc8799

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index a637c98c390e..af261e97ce1a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -77,8 +77,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScTokenStack )
 IMPL_FIXEDMEMPOOL_NEWDEL( ScInterpreter )
 
 ScCalcConfig *ScInterpreter::mpGlobalConfig = nullptr;
-thread_local std::unique_ptr<ScTokenStack> ScInterpreter::pGlobalStack;
-thread_local bool ScInterpreter::bGlobalStackInUse = false;
 
 using namespace formula;
 using ::std::unique_ptr;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f490a56a513e..b2dc0adee55e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -82,7 +82,8 @@ using ::std::unique_ptr;
 
 #define ADDIN_MAXSTRLEN 256
 
-//-----------------------------static data -----------------
+thread_local std::unique_ptr<ScTokenStack> ScInterpreter::pGlobalStack;
+thread_local bool ScInterpreter::bGlobalStackInUse = false;
 
 // document access functions