From 259ae22056b34f3477fc7ac0f31666dec41bf8ea Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 14 Feb 2023 23:25:40 +0100 Subject: Drop 'using namespace ::std' in dirs [e-p]* Change-Id: Ibe6a2f662f5721c594d28a8e0d7340d0f3cffe95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147075 Tested-by: Jenkins Reviewed-by: Gabor Kelemen --- io/source/stm/odata.cxx | 3 +-- io/source/stm/omark.cxx | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'io') diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 7d39a5835852..6b19585da942 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -40,7 +40,6 @@ using namespace ::cppu; using namespace ::osl; -using namespace ::std; using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -1039,7 +1038,7 @@ private: Reference < XComponentContext > m_rCxt; bool m_bValidMarkable; Reference < XMarkableStream > m_rMarkable; - vector < Reference< XPersistObject > > m_aPersistVector; + std::vector < Reference< XPersistObject > > m_aPersistVector; }; diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index d4bf6c74169a..3e6127d7310e 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -40,7 +40,6 @@ #include #include -using namespace ::std; using namespace ::cppu; using namespace ::osl; using namespace ::com::sun::star::io; @@ -116,7 +115,7 @@ private: bool m_bValidStream; MemRingBuffer m_aRingBuffer; - map > m_mapMarks; + std::map > m_mapMarks; sal_Int32 m_nCurrentPos; sal_Int32 m_nCurrentMark; @@ -204,7 +203,7 @@ sal_Int32 OMarkableOutputStream::createMark() void OMarkableOutputStream::deleteMark(sal_Int32 Mark) { std::unique_lock guard( m_mutex ); - map >::iterator ii = m_mapMarks.find( Mark ); + std::map >::iterator ii = m_mapMarks.find( Mark ); if( ii == m_mapMarks.end() ) { throw IllegalArgumentException( @@ -218,7 +217,7 @@ void OMarkableOutputStream::deleteMark(sal_Int32 Mark) void OMarkableOutputStream::jumpToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map >::iterator ii = m_mapMarks.find( nMark ); + std::map >::iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { throw IllegalArgumentException( @@ -239,7 +238,7 @@ sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map >::const_iterator ii = m_mapMarks.find( nMark ); + std::map >::const_iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { @@ -424,7 +423,7 @@ private: bool m_bValidStream; std::unique_ptr m_pBuffer; - map > m_mapMarks; + std::map > m_mapMarks; sal_Int32 m_nCurrentPos; sal_Int32 m_nCurrentMark; @@ -600,7 +599,7 @@ sal_Int32 OMarkableInputStream::createMark() void OMarkableInputStream::deleteMark(sal_Int32 Mark) { std::unique_lock guard( m_mutex ); - map >::iterator ii = m_mapMarks.find( Mark ); + std::map >::iterator ii = m_mapMarks.find( Mark ); if( ii == m_mapMarks.end() ) { throw IllegalArgumentException( @@ -614,7 +613,7 @@ void OMarkableInputStream::deleteMark(sal_Int32 Mark) void OMarkableInputStream::jumpToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map >::iterator ii = m_mapMarks.find( nMark ); + std::map >::iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { @@ -635,7 +634,7 @@ void OMarkableInputStream::jumpToFurthest() sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark) { std::unique_lock guard( m_mutex ); - map >::const_iterator ii = m_mapMarks.find( nMark ); + std::map >::const_iterator ii = m_mapMarks.find( nMark ); if( ii == m_mapMarks.end() ) { -- cgit