diff options
Diffstat (limited to 'connectivity/source/drivers/hsqldb')
5 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 10616c202aed..2864042b80e2 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -133,7 +133,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) Sequence< Type > SAL_CALL OHCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index abcd6d23f301..36abefe200d3 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -408,7 +408,7 @@ namespace connectivity { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( "Storage" ,"Defines the storage where the database will be stored." @@ -577,7 +577,7 @@ namespace connectivity if ( xStorage.is() ) { OUString sKey = StorageContainer::getRegisteredKey(xStorage); - TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(), + TWeakPairVector::iterator i = std::find_if(m_aConnections.begin(),m_aConnections.end(), [&sKey] (const TWeakPairVector::value_type& conn) { return conn.second.first == sKey; }); @@ -633,7 +633,7 @@ namespace connectivity OUString sKey = StorageContainer::getRegisteredKey(xStorage); if ( !sKey.isEmpty() ) { - TWeakPairVector::const_iterator i = ::std::find_if(m_aConnections.begin(), m_aConnections.end(), + TWeakPairVector::const_iterator i = std::find_if(m_aConnections.begin(), m_aConnections.end(), [&sKey] (const TWeakPairVector::value_type& conn) { return conn.second.first == sKey; }); diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 6e43cd9cb183..fe1c184d7e99 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -191,7 +191,7 @@ namespace connectivity OSL_ENSURE(_xStorage.is(),"Storage is NULL!"); TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map - TStorages::const_iterator aFind = ::std::find_if(rMap.begin(),rMap.end(), + TStorages::const_iterator aFind = std::find_if(rMap.begin(),rMap.end(), [&_xStorage] (const TStorages::value_type& storage) { return storage.second.mapStorage() == _xStorage; }); @@ -222,7 +222,7 @@ namespace connectivity OSL_ENSURE(_xStorage.is(),"Storage is NULL!"); TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map - TStorages::const_iterator aFind = ::std::find_if(rMap.begin(),rMap.end(), + TStorages::const_iterator aFind = std::find_if(rMap.begin(),rMap.end(), [&_xStorage] (const TStorages::value_type& storage) { return storage.second.mapStorage() == _xStorage; }); diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 6bcecb57509a..af99e0e5b467 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -343,7 +343,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) if ( m_Type == "VIEW" ) { Sequence< Type > aTypes = OTableHelper::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pIter = aTypes.getConstArray(); const Type* pEnd = pIter + aTypes.getLength(); diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 49df4672300a..81f06835d520 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -159,8 +159,8 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stor try { do { - if (tmpLongVal >= ::std::numeric_limits<sal_Int64>::max() ) - tmpIntVal = ::std::numeric_limits<sal_Int32>::max(); + if (tmpLongVal >= std::numeric_limits<sal_Int64>::max() ) + tmpIntVal = std::numeric_limits<sal_Int32>::max(); else // Casting is safe here. tmpIntVal = static_cast<sal_Int32>(tmpLongVal); |