Kaydet (Commit) 3638561b authored tarafından Arnaud Versini's avatar Arnaud Versini

Replace usage of rtl/memory.h in cppu with their equivalent from string.h

Change-Id: Ia49c97ad58b21dc360a366260b62bcc6b4975dee
üst 10ada837
......@@ -1726,7 +1726,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
sal_Int32 nSize = getDescriptionSize( (*ppNewDescription)->eTypeClass );
// copy all specific data for the descriptions
::rtl_copyMemory(
memcpy(
pTDR->pType +1,
*ppNewDescription +1,
nSize - sizeof(typelib_TypeDescription) );
......
......@@ -19,6 +19,8 @@
#ifndef ASSIGN_HXX
#define ASSIGN_HXX
#include <string.h>
#include "prim.hxx"
#include "destr.hxx"
#include "constr.hxx"
......@@ -128,7 +130,7 @@ inline sal_Bool _assignArray(
case typelib_TypeClass_DOUBLE:
for (i=0; i < nTotalElements; i++)
{
::rtl_copyMemory((sal_Char *)pDest + i * nElementSize,
memcpy((sal_Char *)pDest + i * nElementSize,
(sal_Char *)pSource + i * nElementSize,
nElementSize);
}
......
......@@ -17,7 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <rtl/memory.h>
#include <string.h>
#include <rtl/alloc.h>
#include <osl/diagnose.h>
#include <osl/interlck.h>
......@@ -380,7 +381,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Unicode), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Unicode) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Unicode) * nStartIndex),
sizeof(sal_Unicode) * (nStopIndex - nStartIndex) );
......@@ -391,7 +392,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Bool), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Bool) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Bool) * nStartIndex),
sizeof(sal_Bool) * (nStopIndex - nStartIndex) );
......@@ -402,7 +403,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Int8), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Int8) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Int8) * nStartIndex),
sizeof(sal_Int8) * (nStopIndex - nStartIndex) );
......@@ -414,7 +415,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Int16), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Int16) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Int16) * nStartIndex),
sizeof(sal_Int16) * (nStopIndex - nStartIndex) );
......@@ -426,7 +427,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Int32), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Int32) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Int32) * nStartIndex),
sizeof(sal_Int32) * (nStopIndex - nStartIndex) );
......@@ -438,7 +439,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Int64), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Int64) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Int64) * nStartIndex),
sizeof(sal_Int64) * (nStopIndex - nStartIndex) );
......@@ -449,7 +450,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(float), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(float) * nStartIndex),
(char *)pSourceElements + (sizeof(float) * nStartIndex),
sizeof(float) * (nStopIndex - nStartIndex) );
......@@ -460,7 +461,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(double), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(double) * nStartIndex),
(char *)pSourceElements + (sizeof(double) * nStartIndex),
sizeof(double) * (nStopIndex - nStartIndex) );
......@@ -471,7 +472,7 @@ static inline bool icopyConstructFromElements(
pSeq = reallocSeq( pSeq, sizeof(sal_Int32), nAlloc );
if (pSeq != 0)
{
::rtl_copyMemory(
memcpy(
pSeq->elements + (sizeof(sal_Int32) * nStartIndex),
(char *)pSourceElements + (sizeof(sal_Int32) * nStartIndex),
sizeof(sal_Int32) * (nStopIndex - nStartIndex) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment