From e3c0b6e6eecdcd94b37d8bb126668ec0db52d487 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Aug 2018 20:39:18 +0200 Subject: Revert rtl_alloc_preInit back to boolean argument This effectively reverts 271a663d2f098f3f665cab6da2e13b265a7eab93 "rtl: support start/stop threads around pre-init" again, now that df6ba650469a6f2fda06ef1c2e107ccdd3570505 "Remove 'officially dead now' rtl_cache slab allocator mechanism" removed the wsupdate thread. (rtl_alloc_preInit is an internal-use-only C function, so changing its arguments doesn't affect URE compatibility.) Change-Id: Ie9bce86377f9520e2600e4111ac525dddace10f8 Reviewed-on: https://gerrit.libreoffice.org/58443 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sal/qa/rtl/alloc/rtl_alloc.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sal/qa') diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 37c7b41eb338..0e9b7c0f47a8 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -158,7 +158,7 @@ public: const char *sample = "Hello World"; std::vector aStrings; - rtl_alloc_preInit(rtlAllocPreInitStart); + rtl_alloc_preInit(true); OUString aFoo("foo"); @@ -183,7 +183,7 @@ public: } // should static-ize all the strings. - rtl_alloc_preInit(rtlAllocPreInitEnd); + rtl_alloc_preInit(false); for (size_t i = 0; i < aStrings.size(); ++i) CPPUNIT_ASSERT_MESSAGE( "static after.", (aStrings[i].pData->refCount & SAL_STRING_STATIC_FLAG) ); -- cgit