Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 00:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #548 from ZappoMan/master

Browse source 
memmove instead of memcpy for known overlapping copies
This commit is contained in:
ZappoMan 2013-06-18 13:45:53 -07:00
commit 9a7e8c4471
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/SharedUtil.cpp
View file

@ -423,10 +423,10 @@ int insertIntoSortedArrays(void* value, float key, int originalIndex,
// i is our desired location // i is our desired location
// shift array elements to the right // shift array elements to the right
if (i < currentCount && i+1 < maxCount) { if (i < currentCount && i+1 < maxCount) {
memcpy(&valueArray[i + 1], &valueArray[i], sizeof(void*) * (currentCount - i)); memmove(&valueArray[i + 1], &valueArray[i], sizeof(void*) * (currentCount - i));
memcpy(&keyArray[i + 1], &keyArray[i], sizeof(float) * (currentCount - i)); memmove(&keyArray[i + 1], &keyArray[i], sizeof(float) * (currentCount - i));
if (originalIndexArray) { if (originalIndexArray) {
memcpy(&originalIndexArray[i + 1], &originalIndexArray[i], sizeof(int) * (currentCount - i)); memmove(&originalIndexArray[i + 1], &originalIndexArray[i], sizeof(int) * (currentCount - i));
} }
} }
} }