32-bit Linux build error: no matching function for call to 'assertEquals'

[CXX] toolkit/qa/cppunit/EventContainer.cxx
/core/toolkit/qa/cppunit/EventContainer.cxx:73:5: error: no matching function for call to 
'assertEquals'
    CPPUNIT_ASSERT_EQUAL(4, nEventCount);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/core/workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:333:5: note: expanded from macro 
'CPPUNIT_ASSERT_EQUAL'
  ( CPPUNIT_NS::assertEquals( (expected),              \
    ^~~~~~~~~~~~~~~~~~~~~~~~
/core/workdir/UnpackedTarball/cppunit/include/cppunit/Portability.h:107:21: note: expanded from 
macro 'CPPUNIT_NS'
# define CPPUNIT_NS CppUnit
                    ^
/core/workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:161:6: note: candidate template 
ignored: deduced conflicting types for parameter 'T' ('int' vs. 'long')
void assertEquals( const T& expected,
     ^
1 error generated.
make[1]: *** [/core/solenv/gbuild/LinkTarget.mk:306: 
/core/workdir/CxxObject/toolkit/qa/cppunit/EventContainer.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:282: build] Error 2

This looks to have begun after:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4021fedf758b

Samuel,
Any idea what's wrong?

-Luke