From 3638561bef4558102f5b5e8f6f9004d8da787f8d Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.versini@gmail.com>
Date: Sun, 29 Jul 2012 17:49:42 +0200
Subject: Replace usage of rtl/memory.h in cppu with their equivalent from
 string.h

Change-Id: Ia49c97ad58b21dc360a366260b62bcc6b4975dee
---
 cppu/source/typelib/typelib.cxx |  2 +-
 cppu/source/uno/assign.hxx      |  4 +++-
 cppu/source/uno/sequence.cxx    | 21 +++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'cppu/source')

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 90f7ba6bffdf..128c4b2e7c1c 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -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) );
diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx
index 2a6b8130a1b8..a6ba011e07ab 100644
--- a/cppu/source/uno/assign.hxx
+++ b/cppu/source/uno/assign.hxx
@@ -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);
         }
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 1397a8932af9..c62325cc3c39 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -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) );
-- 
cgit v1.2.3