generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 02:57:47 +01:00
Code Issues Projects Releases Wiki Activity

yqueue_t uses malloc/free instead of new/delete

Browse Source
This commit is contained in:
Martin Sustrik 2010-02-04 23:58:41 +01:00
parent 30076c4f7a
commit 0888fcd06f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/yqueue.hpp
View File

@ -20,7 +20,7 @@
#ifndef __ZMQ_YQUEUE_HPP_INCLUDED__ #ifndef __ZMQ_YQUEUE_HPP_INCLUDED__
#define __ZMQ_YQUEUE_HPP_INCLUDED__ #define __ZMQ_YQUEUE_HPP_INCLUDED__
#include <new> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include "err.hpp" #include "err.hpp"
@ -49,7 +49,7 @@ namespace zmq
// Create the queue. // Create the queue.
inline yqueue_t () inline yqueue_t ()
{ {
begin_chunk = new (std::nothrow) chunk_t; begin_chunk = (chunk_t*) malloc (sizeof (chunk_t));
zmq_assert (begin_chunk); zmq_assert (begin_chunk);
begin_pos = 0; begin_pos = 0;
back_chunk = NULL; back_chunk = NULL;
@ -63,17 +63,17 @@ namespace zmq
{ {
while (true) { while (true) {
if (begin_chunk == end_chunk) { if (begin_chunk == end_chunk) {
delete begin_chunk; free (begin_chunk);
break; break;
} }
chunk_t *o = begin_chunk; chunk_t *o = begin_chunk;
begin_chunk = begin_chunk->next; begin_chunk = begin_chunk->next;
delete o; free (o);
} }
chunk_t *sc = spare_chunk.xchg (NULL); chunk_t *sc = spare_chunk.xchg (NULL);
if (sc) if (sc)
delete sc; free (sc);
} }
// Returns reference to the front element of the queue. // Returns reference to the front element of the queue.
@ -103,7 +103,7 @@ namespace zmq
if (sc) { if (sc) {
end_chunk->next = sc; end_chunk->next = sc;
} else { } else {
end_chunk->next = new (std::nothrow) chunk_t; end_chunk->next = (chunk_t*) malloc (sizeof (chunk_t));
zmq_assert (end_chunk->next); zmq_assert (end_chunk->next);
} }
end_chunk = end_chunk->next; end_chunk = end_chunk->next;
@ -123,7 +123,7 @@ namespace zmq
// use 'o' as the spare. // use 'o' as the spare.
chunk_t *cs = spare_chunk.xchg (o); chunk_t *cs = spare_chunk.xchg (o);
if (cs) if (cs)
delete cs; free (cs);
} }
} }