d3dretrace: Prevent ScopedAllocator::alloc<D3DPRESENT_PARAMETERS> clash.

[apitrace] / retrace / retrace.hpp

diff --git a/retrace/retrace.hpp b/retrace/retrace.hpp
index 56cebc6195135dfcd7f7e0bf51158f1bf0ede755..cc77029e7aba59839cb907fbf969234b4df4a9d0 100644 (file)
--- a/retrace/retrace.hpp
+++ b/retrace/retrace.hpp
@@ -60,6 +60,7 @@ private:
     uintptr_t next;
 
 public:
+    inline
     ScopedAllocator() :
         next(0) {
     }
@@ -81,21 +82,14 @@ public:
         return static_cast<void *>(&buf[1]);
     }
 
-    template< class T >
-    inline T *
-    alloc(size_t n = 1) {
-        return static_cast<T *>(alloc(sizeof(T) * n));
-    }
-
     /**
      * Allocate an array with the same dimensions as the specified value.
      */
-    template< class T >
-    inline T *
-    alloc(const trace::Value *value) {
+    inline void *
+    alloc(const trace::Value *value, size_t size) {
         const trace::Array *array = dynamic_cast<const trace::Array *>(value);
         if (array) {
-            return alloc<T>(array->size());
+            return alloc(array->size() * size);
         }
         const trace::Null *null = dynamic_cast<const trace::Null *>(value);
         if (null) {
@@ -211,6 +205,24 @@ public:
 };
 
 
+class Dumper
+{
+public:
+    virtual image::Image *
+    getSnapshot(void) {
+        return NULL;
+    }
+
+    virtual bool
+    dumpState(std::ostream &os) {
+        return false;
+    }
+};
+
+
+extern Dumper *dumper;
+
+
 void
 setUp(void);
 
@@ -220,11 +232,7 @@ addCallbacks(retrace::Retracer &retracer);
 void
 frameComplete(trace::Call &call);
 
-image::Image *
-getSnapshot(void);
 
-bool
-dumpState(std::ostream &os);
 
 void
 flushRendering(void);