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

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Fri Feb 12 10:46:09 UTC 2021


 comphelper/qa/unit/threadpooltest.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60b0bb80b3aeb52477256152dcda9ec6e4dbb9fd
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Feb 12 10:55:42 2021 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Feb 12 11:45:25 2021 +0100

    Fix threadpool test for --enable-debug
    
    NDEBUG is obviously defined then, and doWork does not use
    mThreadId and mCheckEqual, resulting in errors like
    "private field 'mThread' is not used".
    
    Change-Id: Ie429a6584ee5a335dbc9b29fae202727d9daa720
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110777
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/comphelper/qa/unit/threadpooltest.cxx b/comphelper/qa/unit/threadpooltest.cxx
index 695aca5b421a..890fdfe93f22 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -121,8 +121,8 @@ public:
     }
     virtual void doWork()
     {
-        assert(mCheckEqual ? osl::Thread::getCurrentIdentifier() == mThreadId
-                           : osl::Thread::getCurrentIdentifier() != mThreadId);
+        CPPUNIT_ASSERT(mCheckEqual ? osl::Thread::getCurrentIdentifier() == mThreadId
+                                   : osl::Thread::getCurrentIdentifier() != mThreadId);
     }
 };
 } // namespace


More information about the Libreoffice-commits mailing list