hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ResizeablePointer const fix

Browse source
This commit is contained in:
Thulinma 2018-02-08 12:40:06 +01:00
parent 93114d53f9
commit 68c87a44d0
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/util.cpp
View file

@ -171,14 +171,14 @@ namespace Util{
maxSize = 0; maxSize = 0;
} }
bool ResizeablePointer::assign(void * p, uint32_t l){ bool ResizeablePointer::assign(const void * p, uint32_t l){
if (!allocate(l)){return false;} if (!allocate(l)){return false;}
memcpy(ptr, p, l); memcpy(ptr, p, l);
currSize = l; currSize = l;
return true; return true;
} }
bool ResizeablePointer::append(void * p, uint32_t l){ bool ResizeablePointer::append(const void * p, uint32_t l){
if (!allocate(l+currSize)){return false;} if (!allocate(l+currSize)){return false;}
memcpy(((char*)ptr)+currSize, p, l); memcpy(((char*)ptr)+currSize, p, l);
currSize += l; currSize += l;

4
lib/util.h
View file

@ -21,8 +21,8 @@ namespace Util{
ResizeablePointer(); ResizeablePointer();
~ResizeablePointer(); ~ResizeablePointer();
inline uint32_t& size(){return currSize;} inline uint32_t& size(){return currSize;}
bool assign(void * p, uint32_t l); bool assign(const void * p, uint32_t l);
bool append(void * p, uint32_t l); bool append(const void * p, uint32_t l);
bool allocate(uint32_t l); bool allocate(uint32_t l);
inline operator char*(){return (char*)ptr;} inline operator char*(){return (char*)ptr;}
inline operator void*(){return ptr;} inline operator void*(){return ptr;}