Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 17:00:53 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Getting rid of global_alloc_array_clear at least, clearing is essential to objects in vector_t so that is why previous attempt did not work (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-01-07 20:15:36 +01:00
parent e0d0a314e5
commit 20e363d0b0
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/devices/sound/discrete.h
View File

@ -3758,15 +3758,15 @@ public:
vector_t(int initial) {
m_count = 0;
m_allocated = initial;
m_arr = global_alloc_array_clear(_ElementType, m_allocated);
m_arr = make_unique_clear<_ElementType[]>(m_allocated);
}
vector_t() {
m_count = 0;
m_allocated = 16;
m_arr = global_alloc_array_clear(_ElementType, m_allocated);
m_arr = make_unique_clear<_ElementType[]>(m_allocated);
}
~vector_t() {
global_free_array(m_arr);
m_arr = nullptr;
}
_ElementType& operator [] (unsigned int index) const // get array item
{
@ -3779,7 +3779,7 @@ public:
if (m_allocated < 16)
m_allocated = 16;
m_count = a.count();
m_arr = global_alloc_array_clear(_ElementType, m_allocated);
m_arr = make_unique_clear<_ElementType[]>(m_allocated);
for (int i=0; i < m_count; i++)
m_arr[i] = a[i];
}
@ -3790,7 +3790,7 @@ public:
if (m_allocated < 16)
m_allocated = 16;
m_count = a.count();
m_arr = global_alloc_array_clear(_ElementType, m_allocated);
m_arr = make_unique_clear<_ElementType[]>(m_allocated);
for (int i=0; i < m_count; i++)
m_arr[i] = a[i];
return *this;
@ -3800,12 +3800,14 @@ public:
{
if (m_count >= m_allocated)
{
auto oldarr = make_unique_clear<_ElementType[]>(m_allocated);
for (int i = 0; i < m_count; i++)
oldarr[i] = m_arr[i];
m_allocated *= 2;
auto newarr = global_alloc_array_clear(_ElementType, m_allocated);
for (int i=0; i < m_count; i++)
newarr[i] = m_arr[i];
global_free_array(m_arr);
m_arr = newarr;
m_arr = make_unique_clear<_ElementType[]>(m_allocated);
for (int i = 0; i < m_count; i++)
m_arr[i] = oldarr[i];
}
m_arr[m_count] = object;
m_count++;
@ -3819,10 +3821,10 @@ public:
}
inline void clear(void) { m_count = 0; }
inline int count(void) const { return m_count; }
inline _ElementType *begin_ptr(void) const { return m_arr; }
inline _ElementType *end_ptr(void) const { return m_arr + (m_count - 1); }
inline _ElementType *begin_ptr(void) const { return m_arr.get(); }
inline _ElementType *end_ptr(void) const { return m_arr.get() + (m_count - 1); }
private:
_ElementType *m_arr;
std::unique_ptr<_ElementType[]> m_arr;
int m_count;
int m_allocated;
};