Changeset 1052 for code/trunk/src/util/MultiType.h

Timestamp:

Apr 14, 2008, 3:42:49 AM (17 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/util/MultiType.h (modified) (3 diffs)

code/trunk/src/util/MultiType.h

@@ -35 +35 @@
 {
     MT_null,
+    MT_void,
     MT_int,
     MT_uint,
@@ -49 +50 @@
     MT_constchar,
     MT_string,
+    MT_xmlelement,
     MT_vector2,
     MT_vector3,
@@ -59 +61 @@
 union _UtilExport MultiTypeValue
 {
+    void*           void_;
     int             int_;
     unsigned int    uint_;