debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix deprecation warnings on DMD 2.079.0.

Browse source
This commit is contained in:
Sönke Ludwig 2018-03-06 20:13:59 +01:00
parent 5dad437e10
commit eb046e2295
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/vibe/internal/array.d
View file

@ -304,7 +304,7 @@ struct FixedRingBuffer(T, size_t N = 0, bool INITIALIZE = true) {
static if( N == 0 ){ static if( N == 0 ){
bool m_freeOnDestruct; bool m_freeOnDestruct;
this(size_t capacity) { m_buffer = new T[capacity]; } this(size_t capacity) { m_buffer = new T[capacity]; }
~this() { if (m_freeOnDestruct && m_buffer.length > 0) delete m_buffer; } ~this() { if (m_freeOnDestruct && m_buffer.length > 0) deleteCompat(m_buffer); }
} }
@property bool empty() const { return m_fill == 0; } @property bool empty() const { return m_fill == 0; }
@ -323,7 +323,7 @@ struct FixedRingBuffer(T, size_t N = 0, bool INITIALIZE = true) {
/// Resets the capacity to zero and explicitly frees the memory for the buffer. /// Resets the capacity to zero and explicitly frees the memory for the buffer.
void dispose() void dispose()
{ {
delete m_buffer; deleteCompat(m_buffer);
m_buffer = null; m_buffer = null;
m_start = m_fill = 0; m_start = m_fill = 0;
} }
@ -336,14 +336,14 @@ struct FixedRingBuffer(T, size_t N = 0, bool INITIALIZE = true) {
auto newfill = min(m_fill, new_size); auto newfill = min(m_fill, new_size);
read(dst[0 .. newfill]); read(dst[0 .. newfill]);
if (m_freeOnDestruct && m_buffer.length > 0) () @trusted { if (m_freeOnDestruct && m_buffer.length > 0) () @trusted {
delete m_buffer; deleteCompat(m_buffer);
} (); } ();
m_buffer = newbuffer; m_buffer = newbuffer;
m_start = 0; m_start = 0;
m_fill = newfill; m_fill = newfill;
} else { } else {
if (m_freeOnDestruct && m_buffer.length > 0) () @trusted { if (m_freeOnDestruct && m_buffer.length > 0) () @trusted {
delete m_buffer; deleteCompat(m_buffer);
} (); } ();
m_buffer = new T[new_size]; m_buffer = new T[new_size];
} }
@ -649,3 +649,11 @@ struct ArraySet(Key)
foreach (ref k; m_entries) if (k == key) { k = Key.init; return; } foreach (ref k; m_entries) if (k == key) { k = Key.init; return; }
} }
} }
private void deleteCompat(T)(ref T v)
{
static if (__VERSION__ >= 2079) {
import core.memory : __delete;
__delete(v);
} else mixin("delete v;");
}