Changeset c08c3cf for libcfa/src/containers/list.hfa

Timestamp:

Jan 20, 2021, 8:46:31 PM (5 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/containers/list.hfa (modified) (4 diffs)

libcfa/src/containers/list.hfa

@@ -66 +66 @@
 #define __DLISTED_MGD_JUSTIMPL(STRUCT)
 
-forall( dtype tE ) {
+forall( tE & ) {
         struct $mgd_link {
                 tE *elem;
@@ -83 +83 @@
                 (this.is_terminator){ 1 };
         }
-        forall ( otype tInit | { void ?{}( $mgd_link(tE) &, tInit); } )
+        forall ( tInit | { void ?{}( $mgd_link(tE) &, tInit); } )
         static inline void ?=?( $mgd_link(tE) &this, tInit i ) {
                 ^?{}( this );
@@ -115 +115 @@
   __DLISTED_MGD_COMMON(STRUCT, STRUCT, $links)
 
-trait $dlistable(dtype Tnode, dtype Telem) {
+trait $dlistable(Tnode &, Telem &) {
         $mgd_link(Telem) & $prev_link(Tnode &);
         $mgd_link(Telem) & $next_link(Tnode &);
@@ -125 +125 @@
 };
 
-forall (dtype Tnode, dtype Telem | $dlistable(Tnode, Telem)) {
+forall (Tnode &, Telem & | $dlistable(Tnode, Telem)) {
 
         // implemented as a sentinel item in an underlying cicrular list