diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-06 20:30:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-06 21:06:06 +0100 |
| commit | eb9b890bc95005c4d97622630786359d1b821cb5 (patch) | |
| tree | 0c9db00aa08eb0310f0203eb68dcdb2b9b698ffc /connectivity | |
| parent | 82a30a456e08a27267c35c3df0c6ecd8b9079611 (diff) | |
DBG_ASSERT->assert when followed by dereference
Change-Id: I9390228721df1b713d8cf2e719854b74d6b639c8
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/TSortIndex.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/commontools/predicateinput.cxx | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 4cae6249981e..0d0e97a40d10 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -105,7 +105,7 @@ OSortIndex::~OSortIndex() void OSortIndex::AddKeyValue(OKeyValue * pKeyValue) { - OSL_ENSURE(pKeyValue,"Can not be null here!"); + assert(pKeyValue && "Can not be null here!"); if(m_bFrozen) { m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),(OKeyValue *)NULL)); @@ -115,8 +115,6 @@ void OSortIndex::AddKeyValue(OKeyValue * pKeyValue) m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),pKeyValue)); } - - void OSortIndex::Freeze() { OSL_ENSURE(! m_bFrozen,"OSortIndex::Freeze: already frozen!"); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 41cf0b3ae581..9f9cbeedd1de 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -408,10 +408,10 @@ namespace dbtools } else { - if ( pParseNode->count() >= 3 ) + if (pParseNode->count() >= 3) { OSQLParseNode* pValueNode = pParseNode->getChild(2); - OSL_ENSURE( pValueNode, "OPredicateInputController::getPredicateValue: invalid node child!" ); + assert(pValueNode && "OPredicateInputController::getPredicateValue: invalid node child!"); if ( !_bForStatementUse ) { if ( SQL_NODE_STRING == pValueNode->getNodeType() ) |