loplugin:nullptr
Change-Id: I134ca6b0e69124739b734dfb49763da4284f7412 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129652 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
parent
d8be929f4c
commit
7a6786c570
2 changed files with 4 additions and 3 deletions
|
@ -275,7 +275,7 @@ public:
|
|||
static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor)
|
||||
{
|
||||
#if defined _MSC_VER
|
||||
static Inst * m_pInstance = 0;
|
||||
static Inst * m_pInstance = NULL;
|
||||
#endif // _MSC_VER
|
||||
Inst * p = m_pInstance;
|
||||
if (!p)
|
||||
|
@ -300,7 +300,7 @@ public:
|
|||
DataCtor aDataCtor)
|
||||
{
|
||||
#if defined _MSC_VER
|
||||
static Inst * m_pInstance = 0;
|
||||
static Inst * m_pInstance = NULL;
|
||||
#endif // _MSC_VER
|
||||
Inst * p = m_pInstance;
|
||||
if (!p)
|
||||
|
|
|
@ -61,7 +61,8 @@ enum DM_NIR {
|
|||
template<typename T, typename Ifc> HRESULT
|
||||
createInstance(REFIID iid, Ifc ** ppIfc)
|
||||
{
|
||||
return CComCreator< CComObject<T> >::CreateInstance(0, iid, reinterpret_cast<void**>(ppIfc));
|
||||
return
|
||||
CComCreator< CComObject<T> >::CreateInstance(nullptr, iid, reinterpret_cast<void**>(ppIfc));
|
||||
}
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
|
|
Loading…
Reference in a new issue