diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2020-11-04 11:36:29 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2020-11-04 11:36:29 +0100 |
| commit | 49428c8fa6905c87b2b89e094c72f48a1e75b383 (patch) | |
| tree | 80e3b17a8e274bda5464c56622f42788e639fd38 /storage/connect | |
| parent | 78ccc605a56d9f6d7a7fd4dc8bc1003145ec3901 (diff) | |
| download | mariadb-git-49428c8fa6905c87b2b89e094c72f48a1e75b383.tar.gz | |
Fix compile error on LINUX (no suitable operator delete)
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/block.h | 6 | ||||
| -rw-r--r-- | storage/connect/json.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/storage/connect/block.h b/storage/connect/block.h index 479bee373fa..2d922808a67 100644 --- a/storage/connect/block.h +++ b/storage/connect/block.h @@ -44,8 +44,8 @@ class DllExport BLOCK { return PlugSubAlloc(g, mp, size); } // end of new - void* operator new(size_t size, size_t mp) { - xtrc(256, "Realloc at: mp=%zd\n", mp); + void* operator new(size_t size, long long mp) { + xtrc(256, "Realloc at: mp=%lld\n", mp); return (void*)mp; } // end of new @@ -55,7 +55,7 @@ class DllExport BLOCK { #if !defined(__BORLANDC__) // Avoid warning C4291 by defining a matching dummy delete operator void operator delete(void*, PGLOBAL, void *) {} - //void operator delete(void*, size_t) {} + void operator delete(void*, long long) {} #endif virtual ~BLOCK() {} diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp index ce3ddd865a5..d461b60470d 100644 --- a/storage/connect/json.cpp +++ b/storage/connect/json.cpp @@ -1820,7 +1820,7 @@ PJSON SWAP::MptrJson(PJSON ojp) { // ojp is an offset PJAR SWAP::MptrArray(PJAR ojar) { PJAR jarp = (PJAR)MakePtr(Base, (size_t)ojar); - jarp = (PJAR)new((size_t)jarp) JARRAY(NULL); + jarp = (PJAR)new((long long)jarp) JARRAY(NULL); if (jarp->First) { for (int i = 0; i < jarp->Size; i++) @@ -1839,7 +1839,7 @@ PJAR SWAP::MptrArray(PJAR ojar) { PJOB SWAP::MptrObject(PJOB ojob) { PJOB jobp = (PJOB)MakePtr(Base, (size_t)ojob); - jobp = (PJOB)new((size_t)jobp) JOBJECT(NULL); + jobp = (PJOB)new((long long)jobp) JOBJECT(NULL); if (jobp->First) { jobp->First = (PJPR)MptrPair(jobp->First); @@ -1872,7 +1872,7 @@ PJPR SWAP::MptrPair(PJPR ojp) { PJVAL SWAP::MptrJValue(PJVAL ojv) { PJVAL jvp = (PJVAL)MakePtr(Base, (size_t)ojv); - jvp = (PJVAL)new((size_t)jvp) JVALUE(0); + jvp = (PJVAL)new((long long)jvp) JVALUE(0); if (!jvp->Del) { if (jvp->Jsp) |