Changeset c13e8dc8 for src/tests/except-mac.h

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• src/tests/except-mac.h (modified) (4 diffs)

src/tests/except-mac.h

@@ -7 +7 @@
 
 // The fully (perhaps overly) qualified name of the base exception type:
-#define BASE_EXCEPT __cfaehm__base_exception_t
+#define BASE_EXCEPT __cfaabi_ehm__base_exception_t
 
 // Get the name of the vtable type and vtable instance for an exception type:
@@ -30 +30 @@
         size_t size; \
         void (*copy)(except_name *this, except_name * other); \
-        void (*free)(except_name *this); \
+        void (*free)(except_name &this); \
         const char * (*msg)(except_name *this); \
         __VA_ARGS__ \
@@ -42 +42 @@
 // In each constructor the vtable must be initialized.
 #define VTABLE_INIT(this_name,except_name) \
-this_name->virtual_table = &INSTANCE(except_name)
+this_name.virtual_table = &INSTANCE(except_name)
 
 // Declare the vtable instance. This should end an exception declaration.
@@ -73 +73 @@
     this->virtual_table = other->virtual_table; \
 } \
-void ?{}(name * this) { \
+void ?{}(name & this) { \
         VTABLE_INIT(this,name); \
 } \