Changeset c08c3cf for libcfa/src/memory.hfa

Timestamp:

Jan 20, 2021, 8:46:31 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

481cf3a

Parents:

467c8b7 (diff), 9db2c92 (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:

fix conflict

File:

• libcfa/src/memory.hfa (modified) (6 diffs)

libcfa/src/memory.hfa

@@ -17 +17 @@
 
 // Internal data object.
-forall(dtype T | sized(T)) {
+forall(T & | sized(T)) {
         struct counter_data {
                 unsigned int counter;
@@ -23 +23 @@
         };
 
-        forall(ttype Args | { void ?{}(T &, Args); })
+        forall(Args... | { void ?{}(T &, Args); })
         void ?{}(counter_data(T) & this, Args args);
 
@@ -31 +31 @@
 
 // This is one of many pointers keeping this alive.
-forall(dtype T | sized(T)) {
+forall(T & | sized(T)) {
         struct counter_ptr {
                 counter_data(T) * data;
@@ -40 +40 @@
         forall( | { void ^?{}(T &); })
         void ?{}(counter_ptr(T) & this, counter_ptr(T) that);
-        forall(ttype Args | { void ?{}(T&, Args); })
+        forall(Args... | { void ?{}(T&, Args); })
         void ?{}(counter_ptr(T) & this, Args args);
 
@@ -60 +60 @@
 
 // This is the only pointer that keeps this alive.
-forall(dtype T) {
+forall(T &) {
         struct unique_ptr {
                 T * data;
@@ -68 +68 @@
         void ?{}(unique_ptr(T) & this, zero_t);
         void ?{}(unique_ptr(T) & this, unique_ptr(T) that) = void;
-        forall( | sized(T), ttype Args | { void ?{}(T &, Args); })
+        forall( | sized(T), Args... | { void ?{}(T &, Args); })
         void ?{}(unique_ptr(T) & this, Args args);