aboutsummaryrefslogtreecommitdiffstats
path: root/src/kvilib/core/KviHeapObject.cpp
diff options
context:
space:
mode:
authorGravatar ctrlaltca2024-02-24 11:30:48 +0100
committerGravatar GitHub2024-02-24 11:30:48 +0100
commit9e9049626a307f96a6f7cb512ef8111dd0502070 (patch)
tree0bf2bce69d028cc0f11e848a4e81ca0b9f48294a /src/kvilib/core/KviHeapObject.cpp
parentUse separate caches for CI linux qt5 and qt6 builds (#2608) (diff)
downloadKVIrc-9e9049626a307f96a6f7cb512ef8111dd0502070.tar.gz
KVIrc-9e9049626a307f96a6f7cb512ef8111dd0502070.tar.bz2
KVIrc-9e9049626a307f96a6f7cb512ef8111dd0502070.zip
Switch windows CI builds to Github Actions and Qt6 (#2606)
* Make build compatible with ninja generator * Remove usage of Qt Windows Extras under qt6 * Avoid compilation noise on UNICODE redefinition * Remove "KviHeapObject::operator new" signature for debug builds, add placement new operator * Fix implicit cast of 0 to QFlags * Fix Avoid ambiguous overload in concatenating strings * KviIpcSentinel::winEvent - Adapt to changed method signature in qt6 * Remove windows 95/98/me support :) * appveyor: try switching qt version * Try creating a github action for windows build * Remove appveyor config; move windows-only patches into dist/windows/patches
Diffstat (limited to 'src/kvilib/core/KviHeapObject.cpp')
-rw-r--r--src/kvilib/core/KviHeapObject.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/kvilib/core/KviHeapObject.cpp b/src/kvilib/core/KviHeapObject.cpp
index c8e504b62..fe7a5750f 100644
--- a/src/kvilib/core/KviHeapObject.cpp
+++ b/src/kvilib/core/KviHeapObject.cpp
@@ -46,14 +46,9 @@ void KviHeapObject::operator delete[](void * pData)
KviMemory::free(pData);
}
-// these are the debug versions...
-void * KviHeapObject::operator new(size_t uSize, const char *, int)
+// placement new operator - needed by QMetaType
+void * KviHeapObject::operator new(size_t, std::align_val_t, void * pWhere)
{
- return KviMemory::allocate(uSize);
-}
-
-void KviHeapObject::operator delete(void * pData, const char *, int)
-{
- KviMemory::free(pData);
+ return pWhere;
}
#endif