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

lbenes lukebenes at hotmail.com
Mon Aug 1 06:30:42 UTC 2016


 comphelper/source/misc/threadpool.cxx |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit a4a71214d69ce2ef3f1e8dbbf17362ce50e55a45
Author: lbenes <lukebenes at hotmail.com>
Date:   Fri Jul 29 19:40:56 2016 -0400

    comphelper: fix MSVC 2015 build by removing pointless catch
    
    In C++11 the destructors are implicitly noexcept.
    
    Change-Id: I37e78e39bcc19dfbc81a781a5b353e49f09ae942
    Reviewed-on: https://gerrit.libreoffice.org/27708
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 45425fb..f399274 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -72,17 +72,7 @@ public:
             {
                 SAL_WARN("comphelper", "exception in thread worker while calling doWork(): " << e.Message);
             }
-            try {
-                delete pTask;
-            }
-            catch (const std::exception &e)
-            {
-                SAL_WARN("comphelper", "exception in thread worker while deleting task: " << e.what());
-            }
-            catch (const css::uno::Exception &e)
-            {
-                SAL_WARN("comphelper", "exception in thread worker while deleting task: " << e.Message);
-            }
+            delete pTask;
             pTag->onTaskWorkerDone();
         }
     }


More information about the Libreoffice-commits mailing list