comphelper/source/misc/threadpool.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 26e76ada0cb87550e5bac56006da851cf1279a02 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Sep 27 08:53:51 2018 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Sep 27 22:37:07 2018 +0200 -Werror=unused-variable (--enable-debug --disable-assert-always-abort) ...found by <https://ci.libreoffice.org//job/lo_tb_random_config_linux/1504/> Change-Id: I8ebbe48cdbbdf378731bbc4548031d8799d91532 Reviewed-on: https://gerrit.libreoffice.org/61023 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index fc9b2b3e5404..e66d1d18f24e 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -306,7 +306,7 @@ void ThreadTaskTag::waitUntilDone() std::unique_lock< std::mutex > aGuard( maMutex ); while( mnTasksWorking > 0 ) { -#ifdef DBG_UTIL +#if defined DBG_UTIL && !defined NDEBUG // 3 minute timeout in debug mode so our tests fail sooner rather than later std::cv_status result = maTasksComplete.wait_for( aGuard, std::chrono::seconds( 3 * 60 )); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
