Changeset 95eec2c for libcfa/src

Timestamp:

Jan 4, 2021, 3:49:19 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ed1a6374

Parents:

c04a19e (diff), 1958fec (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• memory.cfa (modified) (2 diffs)
• stdlib.hfa (modified) (1 diff)

libcfa/src/memory.cfa

@@ -66 +66 @@
 forall(dtype T | sized(T), ttype Args | { void ?{}(T&, Args); })
 void ?{}(counter_ptr(T) & this, Args args) {
-        this.data = new(args);
+        this.data = (counter_data(T)*)new(args);
 }
 
@@ -126 +126 @@
 forall(dtype T | sized(T), ttype Args | { void ?{}(T &, Args); })
 void ?{}(unique_ptr(T) & this, Args args) {
-        this.data = new(args);
+        this.data = (T *)new(args);
 }
 

libcfa/src/stdlib.hfa

@@ -267 +267 @@
 static inline forall( dtype T | sized(T), ttype TT | { void ?{}( T &, TT ); } )
 T * new( TT p ) {
-        return &(*malloc()){ p };                                                       // run constructor
+        return &(*(T *)malloc()){ p };                                                  // run constructor
 } // new