Changeset 1958Tweet

Timestamp:

Sep 27, 2012, 1:36:33 PM (6 years ago)

Author:

sam

Message:

core: fix a bad format string and disable an annoying warning in Array<>.

Location:

trunk/src

Files:

• array.h (modified) (1 diff)
• gpu/vertexbuffer.cpp (modified) (1 diff)

trunk/src/array.h

@@ -192 +192 @@
             return;
 
-        Element *tmp = reinterpret_cast<Element *>
-                               (new uint8_t [sizeof(Element) * toreserve]);
+        /* This cast is not very nice, because we kill any alignment
+         * information we could have. But until C++ gives us the proper
+         * tools to deal with it, we assume new uint8_t[] returns properly
+         * aligned data. */
+        Element *tmp = reinterpret_cast<Element *>(reinterpret_cast<uintptr_t>
+                               (new uint8_t[sizeof(Element) * toreserve]));
         for (int i = 0; i < m_count; i++)
         {

trunk/src/gpu/vertexbuffer.cpp

@@ -436 +436 @@
             break;
         default:
-            Log::Error("vertex usage %d is not supported yet\n");
+            Log::Error("vertex usage %d is not supported yet\n", usage);
             break;
         }