various misc fixes from merge.

This commit is contained in:
Jeff Hutchinson 2021-09-01 22:36:59 -04:00
parent 17231ca9fb
commit b0549118b6
4 changed files with 5 additions and 4 deletions

View file

@ -284,8 +284,8 @@ class String::StringData : protected StringDataImpl
delete [] mUTF16;
}
void* TORQUE_NOINLINE operator new(size_t size, U32 len);
void* TORQUE_NOINLINE operator new( size_t size, U32 len, DataChunker& chunker );
TORQUE_NOINLINE void* operator new(size_t size, U32 len);
TORQUE_NOINLINE void* operator new( size_t size, U32 len, DataChunker& chunker );
void operator delete(void *);
bool isShared() const