diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 19:06:24 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-17 18:41:19 +0000 |
commit | b57d51e32fb85e9cde64f85719725253162c42e4 (patch) | |
tree | afe75470b9fc3c12a3d240577b07042985882675 /dbaccess/source/core/api/RowSetCache.cxx | |
parent | c910d1dae1a9fcf0591098244debc863dd59618a (diff) |
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'dbaccess/source/core/api/RowSetCache.cxx')
-rw-r--r-- | dbaccess/source/core/api/RowSetCache.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index c1863f66ab53..0f340a5ed97e 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -385,8 +385,8 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) else { // now correct the iterator in our iterator vector - ::std::vector<sal_Int32> aPositions; - ::std::map<sal_Int32,bool> aCacheIterToChange; + std::vector<sal_Int32> aPositions; + std::map<sal_Int32,bool> aCacheIterToChange; // first get the positions where they stand now ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); ORowSetCacheMap::const_iterator aCacheEnd = m_aCacheIterators.end(); @@ -411,8 +411,8 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) m_aMatrixEnd = m_pMatrix->end(); // now adjust their positions because a resize invalidates all iterators - ::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin(); - ::std::map<sal_Int32,bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin(); + std::vector<sal_Int32>::const_iterator aIter = aPositions.begin(); + std::map<sal_Int32,bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin(); for( aCacheIter = m_aCacheIterators.begin(); aPosChangeIter != aCacheIterToChange.end(); ++aPosChangeIter,++aCacheIter) @@ -552,7 +552,7 @@ sal_Int32 ORowSetCache::hashBookmark( const Any& bookmark ) // XRowUpdate void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -572,7 +572,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -592,7 +592,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x , sal_Int32 length,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -613,7 +613,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -635,7 +635,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -795,7 +795,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos) bCheck = m_xCacheSet->next(); } if(aIter != aEnd) - ::std::rotate(m_pMatrix->begin(),aEnd,aIter); + std::rotate(m_pMatrix->begin(),aEnd,aIter); break; } bCheck = m_xCacheSet->next(); @@ -912,7 +912,7 @@ void ORowSetCache::moveWindow() fill(aIter, aNewEnd, nPos, bCheck); } - ::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd); + std::rotate(m_pMatrix->begin(), aEnd, aNewEnd); // now correct the iterator in our iterator vector // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); @@ -994,7 +994,7 @@ void ORowSetCache::moveWindow() { OSL_ENSURE(aIter == aEnd, "fill() said went till end, but did not."); // rotate the end to the front - ::std::rotate(m_pMatrix->begin(), aIter, aDataEnd); + std::rotate(m_pMatrix->begin(), aIter, aDataEnd); // now correct the iterator in our iterator vector rotateCacheIterator( nNewStartPosInMatrix ); m_nStartPos = nNewStartPos; @@ -1028,7 +1028,7 @@ void ORowSetCache::moveWindow() nPos -= 1; m_nStartPos += nFetchedRows; m_nEndPos = nPos; - ::std::rotate(m_pMatrix->begin(), aIter, aDataEnd); + std::rotate(m_pMatrix->begin(), aIter, aDataEnd); // now correct the iterator in our iterator vector rotateCacheIterator( nFetchedRows ); @@ -1271,7 +1271,7 @@ bool ORowSetCache::rowInserted( ) } // XResultSetUpdate -bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks) +bool ORowSetCache::insertRow(std::vector< Any >& o_aBookmarks) { if ( !m_bNew || !m_aInsertRow->is() ) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_MOVETOINSERTROW_CALLED),nullptr,SQLSTATE_GENERAL,1000,Any() ); @@ -1327,7 +1327,7 @@ void ORowSetCache::cancelRowModification() resetInsertRow(false); } -void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< Any >& o_aBookmarks ) +void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,std::vector< Any >& o_aBookmarks ) { if(isAfterLast() || isBeforeFirst()) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATEROW),nullptr,SQLSTATE_GENERAL,1000,Any() ); @@ -1568,7 +1568,7 @@ bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OUString sSql = _xAnalyzer->getQuery(); OUString sErrorMsg; ::connectivity::OSQLParser aSqlParser( m_aContext ); - ::std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); + std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); if ( pSqlParseNode.get() && SQL_ISRULE(pSqlParseNode, select_statement) ) { OSQLParseNode* pTableRefCommalist = pSqlParseNode->getByRule(::connectivity::OSQLParseNode::table_ref_commalist); @@ -1719,7 +1719,7 @@ void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet) } void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns) + ,std::vector<sal_Int32>& o_ChangedColumns) { if ( o_ChangedColumns.size() > 1 ) { |