User: rt Date: 2008-06-16 14:02:31+0000 Modified: dba/connectivity/source/drivers/odbc/OTools.cxx
Log: INTEGRATION: CWS hr51 (1.31.22); FILE MERGED 2008/06/06 14:25:06 hr 1.31.22.1: #i88947#: std namespace File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OTools.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OTools.cxx?r1=1.31&r2=1.32 Delta lines: +4 -4 ------------------- --- OTools.cxx 2008-04-10 10:34:54+0000 1.31 +++ OTools.cxx 2008-06-16 14:02:28+0000 1.32 @@ -96,7 +96,7 @@ 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 @@ ::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 @@ ::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 @@ _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; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
