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

Caolán McNamara caolanm at redhat.com
Mon Jul 18 08:02:21 UTC 2016


 comphelper/source/misc/threadpool.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54d8d7718b8ed3b3ddd47f3c2b993be689aeaab3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 18 09:01:39 2016 +0100

    fix build
    
    Change-Id: I90d6826e4544fd39120982f80d41e237a5edbab6

diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index 95f743b..6846f4b 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -338,7 +338,7 @@ void ThreadTaskTag::waitUntilDone()
 #ifdef DBG_UTIL
     // 2 minute timeout in debug mode so our tests fail sooner rather than later
     osl::Condition::Result rv = maTasksComplete.wait(TimeValue { 2*60, 0 });
-    assert(rv != osl_cond_result_timeout);
+    assert(rv != osl::Condition::result_timeout);
 #else
     // 10 minute timeout in production so the app eventually throws some kind of error
     if (maTasksComplete.wait(TimeValue { 10*60, 0 }) == osl::Condition::Result::result_timeout)


More information about the Libreoffice-commits mailing list