From 29bc12777ceffd00ed0ae103b8f2affa26897b4e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 15 Jan 2022 13:50:26 +0100 Subject: Let loplugin:nullptr look into template instantiations It missed some occurrences of 0 when only looking into uninstantiated template code, as Clang doesn't model them with an ImplicitCastExpr, even if the target is known to be a (dependent) pointer type. Looking into all template instantiations of course carries the risk that a given use of 0 is meant to be interpreted as a pointer in some and as an integer in other instantiations. But the only case where that happened in the current code base is RegistryValueList::getElement (include/registry/registry.hxx), where {} is arguably a better choice anyway. (And which would presumably also hold for any future such cases.) Change-Id: I708bcfc8bedc0a49c9282d7814eb325afa29905c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128462 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- ucb/source/inc/regexpmap.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ucb/source/inc') diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index a0477857ee9f..36e778043d68 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -106,7 +106,7 @@ private: template< typename Val > RegexpMapConstIter< Val >::RegexpMapConstIter(): - m_aEntry(OUString(), 0), + m_aEntry(OUString(), nullptr), m_pMap(nullptr), m_nList(-1), m_bEntrySet(false) @@ -115,7 +115,7 @@ RegexpMapConstIter< Val >::RegexpMapConstIter(): template< typename Val > RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap, bool bBegin): - m_aEntry(OUString(), 0), + m_aEntry(OUString(), nullptr), m_pMap(pTheMap), m_bEntrySet(false) { @@ -136,7 +136,7 @@ template< typename Val > inline RegexpMapConstIter< Val >::RegexpMapConstIter(RegexpMap< Val > * pTheMap, int nTheList, ListIterator aTheIndex): - m_aEntry(OUString(), 0), + m_aEntry(OUString(), nullptr), m_aIndex(aTheIndex), m_pMap(pTheMap), m_nList(nTheList), @@ -411,7 +411,7 @@ Val const * RegexpMap< Val >::map(OUString const & rString) const if (m_pDefault && m_pDefault->m_aRegexp.matches(rString)) return &m_pDefault->m_aValue; - return 0; + return nullptr; } } -- cgit