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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 15 11:01:36 UTC 2018


 sc/inc/interpretercontext.hxx              |    2 ++
 sc/source/core/tool/interpretercontext.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 45d9b1b57d72fa859bea399e8b383e460a12fb19
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Thu Nov 15 14:58:54 2018 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Thu Nov 15 12:01:12 2018 +0100

    declare/init nContextIdx only when NDEBUG is undefined
    
    This is necessary to fix a non-debug build failure :
    
    https://ci.libreoffice.org//job/lo_tb_master_mac/27264/consoleFull#283816981d107d11c-eea5-4209-baa1-fcfb59f7f8a6
    
    Change-Id: Ic4882a155dc3a8ea84129ddefe8076693787271c
    Reviewed-on: https://gerrit.libreoffice.org/63402
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/sc/inc/interpretercontext.hxx b/sc/inc/interpretercontext.hxx
index 2b690e311b8c..2f3e33040702 100644
--- a/sc/inc/interpretercontext.hxx
+++ b/sc/inc/interpretercontext.hxx
@@ -135,7 +135,9 @@ public:
 class ScInterpreterContextGetterGuard
 {
     ScInterpreterContextPool& rPool;
+#if !defined NDEBUG
     size_t nContextIdx;
+#endif
 
 public:
     ScInterpreterContextGetterGuard(const ScDocument& rDoc, SvNumberFormatter* pFormatter);
diff --git a/sc/source/core/tool/interpretercontext.cxx b/sc/source/core/tool/interpretercontext.cxx
index 076ed25a0fc2..bc67afca039c 100644
--- a/sc/source/core/tool/interpretercontext.cxx
+++ b/sc/source/core/tool/interpretercontext.cxx
@@ -161,7 +161,9 @@ ScThreadedInterpreterContextGetterGuard::GetInterpreterContextForThreadIdx(size_
 ScInterpreterContextGetterGuard::ScInterpreterContextGetterGuard(const ScDocument& rDoc,
                                                                  SvNumberFormatter* pFormatter)
     : rPool(ScInterpreterContextPool::aNonThreadedInterpreterPool)
+#if !defined NDEBUG
     , nContextIdx(rPool.mnNextFree)
+#endif
 {
     rPool.Init(rDoc, pFormatter);
 }


More information about the Libreoffice-commits mailing list