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
ff300f57
Commit
ff300f57
authored
Sep 06, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
parents
9ac1de7a
20a72bad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
10 deletions
+3
-10
extra/yassl/mySTL/helpers.hpp
extra/yassl/mySTL/helpers.hpp
+1
-7
extra/yassl/mySTL/list.hpp
extra/yassl/mySTL/list.hpp
+2
-2
extra/yassl/taocrypt/src/misc.cpp
extra/yassl/taocrypt/src/misc.cpp
+0
-1
No files found.
extra/yassl/mySTL/helpers.hpp
View file @
ff300f57
...
...
@@ -28,14 +28,11 @@
#define mySTL_HELPERS_HPP
#include <stdlib.h>
#include <new> // placement new
#ifdef __IBMCPP__
/*
Workaround for the lack of operator new(size_t, void*)
in IBM VA C++ 6.0
Also used as a workaround to avoid including <new>
*/
struct
Dummy
{};
...
...
@@ -45,9 +42,6 @@
}
typedef
Dummy
*
yassl_pointer
;
#else
typedef
void
*
yassl_pointer
;
#endif
namespace
mySTL
{
...
...
extra/yassl/mySTL/list.hpp
View file @
ff300f57
...
...
@@ -164,7 +164,7 @@ void list<T>::push_front(T t)
{
void
*
mem
=
malloc
(
sizeof
(
node
));
if
(
!
mem
)
abort
();
node
*
add
=
new
(
mem
)
node
(
t
);
node
*
add
=
new
(
reinterpret_cast
<
yassl_pointer
>
(
mem
)
)
node
(
t
);
if
(
head_
)
{
add
->
next_
=
head_
;
...
...
@@ -210,7 +210,7 @@ void list<T>::push_back(T t)
{
void
*
mem
=
malloc
(
sizeof
(
node
));
if
(
!
mem
)
abort
();
node
*
add
=
new
(
mem
)
node
(
t
);
node
*
add
=
new
(
reinterpret_cast
<
yassl_pointer
>
(
mem
)
)
node
(
t
);
if
(
tail_
)
{
tail_
->
next_
=
add
;
...
...
extra/yassl/taocrypt/src/misc.cpp
View file @
ff300f57
...
...
@@ -24,7 +24,6 @@
#include "runtime.hpp"
#include "misc.hpp"
#include <new> // for NewHandler
void
*
operator
new
(
size_t
sz
,
TaoCrypt
::
new_t
)
...
...
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