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

Stephan Bergmann sbergman at redhat.com
Thu Oct 31 10:31:08 CET 2013


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

New commits:
commit 9aa6fbb518c0b690741af1e07bae894e5cd4ebba
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 31 10:30:30 2013 +0100

    warning C4702: unreachable code
    
    Change-Id: Id8d87765c1e3c9a1549dc6d4baa65fe47dcd6af4

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index c71d2a0..898b91b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1368,6 +1368,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
         std::cerr << ut.mMessage << "\n";
 #ifdef NO_FALLBACK_TO_SWINTERP
         assert(false);
+        return true;
 #else
         return false;
 #endif
@@ -1377,6 +1378,7 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
         std::cerr << oce.mError << "\n";
 #ifdef NO_FALLBACK_TO_SWINTERP
         assert(false);
+        return true;
 #else
         return false;
 #endif
@@ -1385,11 +1387,11 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc,
         std::cerr << "Dynamic formula compiler: unhandled compiler error\n";
 #ifdef NO_FALLBACK_TO_SWINTERP
         assert(false);
+        return true;
 #else
         return false;
 #endif
     }
-    return true;
 } // namespace opencl
 
 }} // namespace sc
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index 88042ef..113049d 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -79,7 +79,6 @@ size_t DynamicKernelArgument::GetWindowSize(void) const
     {
         throw Unhandled();
     }
-    return 0;
 }
 
 void Normal::GenSlidingWindowFunction(


More information about the Libreoffice-commits mailing list