Changeset 1816Tweet

Timestamp:

Aug 25, 2012, 12:12:34 AM (8 years ago)

Author:

sam

Message:

ofsdiofisdoifods

Location:

trunk/src

Files:

• array.h (modified) (3 diffs)
• ticker.cpp (modified) (1 diff)

trunk/src/array.h

@@ -45 +45 @@
         for (int i = 0; i < m_count; i++)
             m_data[i].~Element();
-        delete[] reinterpret_cast<uint8_t *>(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);
     }
 
@@ -175 +182 @@
             return;
 
-        Element *tmp = reinterpret_cast<Element *>
-                               (new uint8_t [sizeof(Element) * toreserve]);
+        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]);
         for (int i = 0; i < m_count; i++)
         {
@@ -183 +201 @@
         }
         if (m_data)
-            delete[] reinterpret_cast<uint8_t *>(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);
+        }
         m_data = tmp;
         m_reserved = toreserve;

trunk/src/ticker.cpp

@@ -166 +166 @@
         Profiler::Start(Profiler::STAT_TICK_GAME);
 
-#if 0
+#if 1
         Log::Debug("-------------------------------------\n");
         for (int i = 0; i < Entity::ALLGROUP_END; i++)