diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 20:16:28 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
| commit | 6cf30940750607eeb062113dbee9968769d7bd06 (patch) | |
| tree | 5d30410c5f32f45105d896c065da3fffbd5edf88 /unoxml/source | |
| parent | 503b248127a92b9ad190e05f6a1d50574183cd47 (diff) | |
WaE: implicit conversion of NULL constant to nullptr_t
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
Diffstat (limited to 'unoxml/source')
| -rw-r--r-- | unoxml/source/dom/element.cxx | 4 | ||||
| -rw-r--r-- | unoxml/source/xpath/nodelist.cxx | 2 | ||||
| -rw-r--r-- | unoxml/source/xpath/xpathapi.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 41cfb0f0a515..50bb0bd27db2 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -625,7 +625,7 @@ namespace DOM AttrChangeType aChangeType = AttrChangeType_MODIFICATION; ::boost::shared_ptr<xmlChar const> const pOld( xmlGetProp(m_aNodePtr, xName), xmlFree); - if (pOld == NULL) { + if (pOld == 0) { aChangeType = AttrChangeType_ADDITION; xmlNewProp(m_aNodePtr, xName, xValue); } else { @@ -708,7 +708,7 @@ namespace DOM AttrChangeType aChangeType = AttrChangeType_MODIFICATION; ::boost::shared_ptr<xmlChar const> const pOld( xmlGetNsProp(m_aNodePtr, xLName, pNs->href), xmlFree); - if (pOld == NULL) { + if (pOld == 0) { aChangeType = AttrChangeType_ADDITION; xmlNewNsProp(m_aNodePtr, pNs, xLName, xValue); } else { diff --git a/unoxml/source/xpath/nodelist.cxx b/unoxml/source/xpath/nodelist.cxx index 2a3c9ff978c8..dbe225bcbc95 100644 --- a/unoxml/source/xpath/nodelist.cxx +++ b/unoxml/source/xpath/nodelist.cxx @@ -31,7 +31,7 @@ namespace XPath , m_rMutex(rMutex) , m_pNodeSet(0) { - if (rxpathObj != NULL && rxpathObj->type == XPATH_NODESET) + if (rxpathObj != 0 && rxpathObj->type == XPATH_NODESET) { m_pNodeSet = rxpathObj->nodesetval; m_pXPathObj = rxpathObj; diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 6a50933e47c5..690dcfc32ff5 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -374,7 +374,7 @@ namespace XPath /* Create xpath evaluation context */ ::boost::shared_ptr<xmlXPathContext> const xpathCtx( xmlXPathNewContext(pDoc), xmlXPathFreeContext); - if (xpathCtx == NULL) { throw XPathException(); } + if (xpathCtx == 0) { throw XPathException(); } // set context node xpathCtx->node = pNode; |