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

[Tor Lillqvist]

 include/sal/log-areas.dox                |    1 +
 sc/source/core/opencl/formulagroupcl.cxx |   10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 90c03dd6281434bd2d8c7f05c3c2c808b298a272
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 26 11:08:57 2013 +0200

    Reduce verbosity a bit
    
    Still lots of gratuitous unconditional writing to std:cerr in there. But
    maybe that's what we want.
    
    Change-Id: I28a65d6535c814bf5c047a7255dd3970fffda5dc

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 7d8d70f..97d2f3c 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -84,6 +84,7 @@ certain functionality.
 
 @li @c sc
 @li @c sc.opencl
+ at li @c sc.opencl.source
 @li @c sc.opencl.thread
 @li @c sc.qa
 @li @c sc.core
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index c87badc..c4290f4 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2514,9 +2514,8 @@ public:
         decl << ") {\n\tint gid0 = get_global_id(0);\n\tresult[gid0] = " <<
             DK->GenSlidingWindowDeclRef(false) << ";\n}\n";
         mFullProgramSrc = decl.str();
-#if 1
-        std::cerr<< "Program to be compiled = \n" << mFullProgramSrc << "\n";
-#endif
+
+        SAL_INFO("sc.opencl.source", "Program to be compiled:\n" << mFullProgramSrc);
     }
     /// Produce kernel hash
     std::string GetMD5(void)
@@ -2590,15 +2589,12 @@ private:
 DynamicKernel::~DynamicKernel()
 {
     if (mpResClmem) {
-        std::cerr<<"Freeing kernel "<< GetMD5() << " result buffer\n";
         clReleaseMemObject(mpResClmem);
     }
     if (mpKernel) {
-        std::cerr<<"Freeing kernel "<< GetMD5() << " kernel\n";
         clReleaseKernel(mpKernel);
     }
     if (mpProgram) {
-        std::cerr<<"Freeing kernel "<< GetMD5() << " program\n";
         clReleaseProgram(mpProgram);
     }
     if (mpCode)
@@ -2647,13 +2643,11 @@ const DynamicKernelArgument *SymbolTable::DeclRefArg(
     ArgumentMap::iterator it = mSymbols.find(ref);
     if (it == mSymbols.end()) {
         // Allocate new symbols
-        std::cerr << "DeclRefArg: Allocate a new symbol:";
         std::stringstream ss;
         ss << "tmp"<< mCurId++;
         boost::shared_ptr<DynamicKernelArgument> new_arg(new T(ss.str(), t, pCodeGen));
         mSymbols[ref] = new_arg;
         mParams.push_back(new_arg);
-        std::cerr << ss.str() <<"\n";
         return new_arg.get();
     } else {
         return it->second.get();