Browse Source

core: revert unfinished commit that wasn't really interesting.

legacy
Sam Hocevar sam 12 years ago
parent
commit
3829380c3c
2 changed files with 5 additions and 32 deletions
  1. +4
    -31
      src/array.h
  2. +1
    -1
      src/ticker.cpp

+ 4
- 31
src/array.h View File

@@ -44,14 +44,7 @@ public:
{
for (int i = 0; i < m_count; i++)
m_data[i].~Element();
if (sizeof(Element) & 1)
delete[] (uint8_t *)(m_data);
else if (sizeof(Element) & 2)
delete[] (uint16_t *)(m_data);
else if (sizeof(Element) & 4)
delete[] (uint32_t *)(m_data);
else
delete[] (uint64_t *)(m_data);
delete[] reinterpret_cast<uint8_t *>(m_data);
}

ArrayBase(ArrayBase const& that) : m_data(0), m_count(0), m_reserved(0)
@@ -181,35 +174,15 @@ public:
if (toreserve <= (int)m_reserved)
return;

Element *tmp;
if (sizeof(Element) & 1)
tmp = (Element *)
(new uint8_t [sizeof(Element) * toreserve]);
else if (sizeof(Element) & 2)
tmp = (Element *)
(new uint16_t [sizeof(Element) / 2 * toreserve]);
else if (sizeof(Element) & 4)
tmp = (Element *)
(new uint32_t [sizeof(Element) / 4 * toreserve]);
else
tmp = (Element *)
(new uint64_t [sizeof(Element) / 8 * toreserve]);
Element *tmp = reinterpret_cast<Element *>
(new uint8_t [sizeof(Element) * toreserve]);
for (int i = 0; i < m_count; i++)
{
new(&tmp[i]) Element(m_data[i]);
m_data[i].~Element();
}
if (m_data)
{
if (sizeof(Element) & 1)
delete[] (uint8_t *)(m_data);
else if (sizeof(Element) & 2)
delete[] (uint16_t *)(m_data);
else if (sizeof(Element) & 4)
delete[] (uint32_t *)(m_data);
else
delete[] (uint64_t *)(m_data);
}
delete[] reinterpret_cast<uint8_t *>(m_data);
m_data = tmp;
m_reserved = toreserve;
}


+ 1
- 1
src/ticker.cpp View File

@@ -165,7 +165,7 @@ void *TickerData::GameThreadMain(void * /* p */)

Profiler::Start(Profiler::STAT_TICK_GAME);

#if 1
#if 0
Log::Debug("-------------------------------------\n");
for (int i = 0; i < Entity::ALLGROUP_END; i++)
{


Loading…
Cancel
Save