Refactor how we define Heap objects

Declare the type of Heap object in the Member() macro, instead of
deducing it from templates. This allows us to encode the offset
of the member in the second template argument to Pointer<> in
a second step.

Change-Id: I2cfb73785749d3fb991689b4e0554a72b3e5e13f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 677f0ebea9..ea3e1d750e 100644
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -184,7 +184,7 @@ namespace Heap {
     struct DataView;
     struct TypedArray;
 
-    template <typename T> struct Pointer;
+    template <typename T, size_t> struct Pointer;
 }
 
 class MemoryManager;
@@ -199,10 +199,11 @@ struct ScriptFunction;
 struct InternalClass;
 struct Property;
 struct Value;
-struct ValueArray;
+template<size_t> struct ValueArray;
 struct Lookup;
 struct ArrayData;
 struct VTable;
+struct Function;
 
 struct BooleanObject;
 struct NumberObject;