diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-06 16:19:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-06 19:20:29 +0100 |
| commit | a596dd99de287c696c70f0c789a774399381f36f (patch) | |
| tree | da2446ed4a5ed65e458b7a17e019dd82353f1a35 /store/source | |
| parent | 08615ce879927bc58924e9591985f27fe59a11fa (diff) | |
loplugin:nullptr
...in non-dependent templated code that Clang trunk now apparently processes
more aggressively, presumably since <https://github.com/llvm/llvm-project/
commit/878a24ee244a24c39d1c57e9af2e88c621f7cce9> "Reapply 'Fix crash on switch
conditions of non-integer types in templates'"
Change-Id: Ia3e4bc6cfe7cea9f816e9282563a8b38e40f0cec
Reviewed-on: https://gerrit.libreoffice.org/84649
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'store/source')
| -rw-r--r-- | store/source/storbase.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx index 0c21acbb3ad3..b9dc53247a8d 100644 --- a/store/source/storbase.hxx +++ b/store/source/storbase.hxx @@ -417,12 +417,12 @@ class PageHolderObject public: bool construct (rtl::Reference< PageData::Allocator > const & rxAllocator) { - if ((m_xPage.get() == 0) && rxAllocator.is()) + if ((m_xPage.get() == nullptr) && rxAllocator.is()) { std::shared_ptr<PageData> tmp (rxAllocator->construct<T>(), PageData::Deallocate(rxAllocator)); m_xPage.swap (tmp); } - return (m_xPage.get() != 0); + return (m_xPage.get() != nullptr); } explicit PageHolderObject (std::shared_ptr<PageData> const & rxPage = std::shared_ptr<PageData>()) @@ -447,7 +447,7 @@ public: bool is() const { - return (m_xPage.get() != 0); + return (m_xPage.get() != nullptr); } std::shared_ptr<PageData> & get() { return m_xPage; } |