diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:02:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:02:28 +0000 |
| commit | 96a0d5b33b18457b8e000c742e4a632da757cbce (patch) | |
| tree | 2be23cfbf0f21b2836a142f5f11f05bffb8c9cf9 /connectivity | |
| parent | 66534ab13643e63617ee15ec27f26fcb1be2981e (diff) | |
INTEGRATION: CWS hr51 (1.31.22); FILE MERGED
2008/06/06 14:25:06 hr 1.31.22.1: #i88947#: std namespace
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OTools.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index ff685c47b1bf..ceb08958f7bb 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OTools.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.32 $ * * This file is part of OpenOffice.org. * @@ -96,7 +96,7 @@ void OTools::bindParameter( OConnection* _pConnection, nColumnSize = 1; if(fSqlType == SQL_LONGVARCHAR || fSqlType == SQL_LONGVARBINARY) - memcpy(pDataBuffer,&nPos,sizeof(nPos)); + std::memcpy(pDataBuffer,&nPos,sizeof(nPos)); // 20.09.2001 OJ: Problems with mysql. mysql returns only CHAR as parameter type // nRetcode = (*(T3SQLDescribeParam)_pConnection->getOdbcFunction(ODBC3SQLDescribeParam))(_hStmt,(SQLUSMALLINT)nPos,&fSqlType,&nColumnSize,&nDecimalDigits,&nNullable); @@ -144,7 +144,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType, ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding)); *pLen = SQL_NTS; _nColumnSize = aString.getLength(); - memcpy(_pData,aString.getStr(),aString.getLength()); + std::memcpy(_pData,aString.getStr(),aString.getLength()); ((sal_Int8*)_pData)[aString.getLength()] = '\0'; } break; @@ -170,7 +170,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType, ::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue); _nColumnSize = aString.getLength(); *pLen = _nColumnSize; - memcpy(_pData,aString.getStr(),aString.getLength()); + std::memcpy(_pData,aString.getStr(),aString.getLength()); ((sal_Int8*)_pData)[_nColumnSize] = '\0'; } break; case SQL_BIT: @@ -523,7 +523,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, _aStatementHandle,SQL_HANDLE_STMT,_xInterface); sal_Int32 nLen = aData.getLength(); aData.realloc(nLen + nBytes); - memcpy(aData.getArray() + nLen, aCharArray, nBytes); + std::memcpy(aData.getArray() + nLen, aCharArray, nBytes); } return aData; } |