summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/pstring.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-05-25 20:28:58 +0200
committer couriersud <couriersud@arcor.de>2016-05-27 01:19:59 +0200
commitfd62273a87b8fe43492e4a466ea97993b88904f8 (patch)
tree896b1aca134a5396e0dedb31aac26875b3466c60 /src/lib/netlist/plib/pstring.cpp
parent111c5a3dc080a4d454dbcadb6c211ccf2c749da7 (diff)
Moved more code into plib namespace. (nw)
Diffstat (limited to 'src/lib/netlist/plib/pstring.cpp')
-rw-r--r--src/lib/netlist/plib/pstring.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/netlist/plib/pstring.cpp b/src/lib/netlist/plib/pstring.cpp
index 73117d01b02..82972aac91c 100644
--- a/src/lib/netlist/plib/pstring.cpp
+++ b/src/lib/netlist/plib/pstring.cpp
@@ -364,7 +364,7 @@ void pstring_t<F>::sfree(pstr_t *s)
stk[sn].push(s);
}
else
- pfree_array(((char *)s));
+ plib::pfree_array(((char *)s));
//_mm_free(((char *)s));
}
}
@@ -373,12 +373,12 @@ template<typename F>
pstr_t *pstring_t<F>::salloc(int n)
{
if (stk == nullptr)
- stk = palloc_array<std::stack<pstr_t *>>(17);
+ stk = plib::palloc_array<std::stack<pstr_t *>>(17);
pstr_t *p;
unsigned sn= ((32 - countleadbits(n)) + 1) / 2;
unsigned size = sizeof(pstr_t) + ((UINT64) 1<<(sn * 2)) + 1;
if (stk[sn].empty())
- p = (pstr_t *) palloc_array<char>(size);
+ p = (pstr_t *) plib::palloc_array<char>(size);
else
{
p = stk[sn].top();
@@ -398,11 +398,11 @@ void pstring_t<F>::resetmem()
{
for (; stk[i].size() > 0; )
{
- pfree_array(stk[i].top());
+ plib::pfree_array(stk[i].top());
stk[i].pop();
}
}
- pfree_array(stk);
+ plib::pfree_array(stk);
stk = nullptr;
}
}
@@ -533,7 +533,7 @@ int pstring_t<F>::pcmp(const mem_t *right) const
pstringbuffer::~pstringbuffer()
{
if (m_ptr != nullptr)
- pfree_array(m_ptr);
+ plib::pfree_array(m_ptr);
}
void pstringbuffer::resize(const std::size_t size)
@@ -543,7 +543,7 @@ void pstringbuffer::resize(const std::size_t size)
m_size = DEFAULT_SIZE;
while (m_size <= size)
m_size *= 2;
- m_ptr = palloc_array<char>(m_size);
+ m_ptr = plib::palloc_array<char>(m_size);
*m_ptr = 0;
m_len = 0;
}
@@ -551,9 +551,9 @@ void pstringbuffer::resize(const std::size_t size)
{
while (m_size < size)
m_size *= 2;
- char *new_buf = palloc_array<char>(m_size);
+ char *new_buf = plib::palloc_array<char>(m_size);
std::memcpy(new_buf, m_ptr, m_len + 1);
- pfree_array(m_ptr);
+ plib::pfree_array(m_ptr);
m_ptr = new_buf;
}
}