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

[Tor Lillqvist]

 sc/source/core/opencl/formulagroupcl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d11715c4c67be4a991cc9fee72ae1c015eac3745
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Aug 30 08:38:42 2015 +0300

    Don't check SAL_DETAIL_ENABLE_LOG_INFO, check SAL_LOG_INFO
    
    SAL_DETAIL_ENABLE_LOG_INFO is always defined, as "true" or "false". It
    is SAL_LOG_INFO that is defined or not, and can be used to avoid
    unnecessary non-trivial code that the compiler might not be able to
    optimise away.
    
    Change-Id: I07a17f2a3668f5776f56663d9cd5a0e238b1e9ce

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index b4882d9..c5b2822 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -135,7 +135,7 @@ std::string StackVarEnumToString(StackVar const e)
     return std::to_string(static_cast<int>(e));
 }
 
-#ifdef SAL_DETAIL_ENABLE_LOG_INFO
+#ifdef SAL_LOG_INFO
 std::string linenumberify(const std::string& s)
 {
     std::stringstream ss;
@@ -3807,7 +3807,7 @@ void DynamicKernel::CodeGen()
     decl << ") {\n\tint gid0 = get_global_id(0);\n\tresult[gid0] = " <<
         DK->GenSlidingWindowDeclRef() << ";\n}\n";
     mFullProgramSrc = decl.str();
-#ifdef SAL_DETAIL_ENABLE_LOG_INFO
+#ifdef SAL_LOG_INFO
     std::stringstream area;
     if (mKernelSignature[0] == '_')
         area << "sc.opencl.source." << mKernelSignature.substr(1, std::string::npos);