diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-06-12 09:15:08 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-06-12 09:15:08 +0200 |
commit | 712351ff83a3deb52dd443ca55328cd71803bdd0 (patch) | |
tree | 1fb8b2b5a7bfe36bf4de5cf3a59955f562137ab6 /store | |
parent | 320a5b88515e20dd35019934b00ac6a79d64de73 (diff) |
-fsanitize=function
Regression introduced with 1f08bff31238d5818c54a0b86570689644dff087 "new
loplugin:shouldreturnbool" (and which this commit partly reverts), as
store::OStorePageBIOS::Ace::constructor is passed to rtl_cache_create in
store::OStorePageBIOS::AceCache::AceCache (store/source/storbios.cxx).
Change-Id: Ia96b456cab4832fc29b6d2abdff082b3cb6f2c79
Diffstat (limited to 'store')
-rw-r--r-- | store/source/storbios.cxx | 3 | ||||
-rw-r--r-- | store/source/storbios.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/store/source/storbios.cxx b/store/source/storbios.cxx index fad48695797d..1a34da60d420 100644 --- a/store/source/storbios.cxx +++ b/store/source/storbios.cxx @@ -396,12 +396,13 @@ OStorePageBIOS::Ace::~Ace() m_prev->m_next = m_next; } -void +int SAL_CALL OStorePageBIOS::Ace::constructor ( void * obj, SAL_UNUSED_PARAMETER void * /* arg */) { Ace * ace = static_cast<Ace*>(obj); ace->m_next = ace->m_prev = ace; + return 1; } OStorePageBIOS::Ace * diff --git a/store/source/storbios.hxx b/store/source/storbios.hxx index fafb54e79fed..8c2abd54f5a7 100644 --- a/store/source/storbios.hxx +++ b/store/source/storbios.hxx @@ -141,7 +141,7 @@ public: Ace(); ~Ace(); - static void SAL_CALL constructor (void * obj, void * arg); + static int SAL_CALL constructor (void * obj, void * arg); static Ace * find (Ace * head, sal_uInt32 addr); static void insert (Ace * head, Ace * entry); |