Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
49428c8f
Commit
49428c8f
authored
Nov 04, 2020
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile error on LINUX (no suitable operator delete)
parent
78ccc605
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
storage/connect/block.h
storage/connect/block.h
+3
-3
storage/connect/json.cpp
storage/connect/json.cpp
+3
-3
No files found.
storage/connect/block.h
View file @
49428c8f
...
...
@@ -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=%
z
d
\n
"
,
mp
);
void
*
operator
new
(
size_t
size
,
long
long
mp
)
{
xtrc
(
256
,
"Realloc at: mp=%
ll
d
\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
()
{}
...
...
storage/connect/json.cpp
View file @
49428c8f
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment