libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Fix compilation of devtools

Browse Source
This commit is contained in:
Thierry Crozat 2021-03-31 23:28:11 +01:00
parent 93e8e2a8c5
commit 7988c1a23c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/base-str.cpp
View File

@ -181,14 +181,18 @@ TEMPLATE
void BASESTRING::incRefCount() const { void BASESTRING::incRefCount() const {
assert(!isStorageIntern()); assert(!isStorageIntern());
if (_extern._refCount == nullptr) { if (_extern._refCount == nullptr) {
#ifndef SCUMMVM_UTIL
lockMemoryPoolMutex(); lockMemoryPoolMutex();
#endif
if (g_refCountPool == nullptr) { if (g_refCountPool == nullptr) {
g_refCountPool = new MemoryPool(sizeof(int)); g_refCountPool = new MemoryPool(sizeof(int));
assert(g_refCountPool); assert(g_refCountPool);
} }
_extern._refCount = (int *)g_refCountPool->allocChunk(); _extern._refCount = (int *)g_refCountPool->allocChunk();
#ifndef SCUMMVM_UTIL
unlockMemoryPoolMutex(); unlockMemoryPoolMutex();
#endif
*_extern._refCount = 2; *_extern._refCount = 2;
} else { } else {
++(*_extern._refCount); ++(*_extern._refCount);
@ -207,10 +211,14 @@ void BASESTRING::decRefCount(int *oldRefCount) {
// The ref count reached zero, so we free the string storage // The ref count reached zero, so we free the string storage
// and the ref count storage. // and the ref count storage.
if (oldRefCount) { if (oldRefCount) {
#ifndef SCUMMVM_UTIL
lockMemoryPoolMutex(); lockMemoryPoolMutex();
#endif
assert(g_refCountPool); assert(g_refCountPool);
g_refCountPool->freeChunk(oldRefCount); g_refCountPool->freeChunk(oldRefCount);
#ifndef SCUMMVM_UTIL
unlockMemoryPoolMutex(); unlockMemoryPoolMutex();
#endif
} }
// Coverity thinks that we always free memory, as it assumes // Coverity thinks that we always free memory, as it assumes
// (correctly) that there are cases when oldRefCount == 0 // (correctly) that there are cases when oldRefCount == 0