Changeset 4897ffa for doc/theses/colby_parsons_MMAth

Timestamp:

Jun 1, 2023, 12:02:36 PM (20 months ago)

Author:

caparsons <caparson@…>

Branches:

ast-experimental, master

Children:

e4a2198

Parents:

0aef549

Message:

fixed merge

File:

• doc/theses/colby_parsons_MMAth/text/channels.tex (modified) (1 diff)

doc/theses/colby_parsons_MMAth/text/channels.tex

@@ -237 +237 @@
 \begin{lrbox}{\myboxB}
 \begin{cfa}[aboveskip=0pt,belowskip=0pt]
-<<<<<<< HEAD
-var cons_done, prod_done bool = false, false;
-var prodJoin chan int = make(chan int)
-var consJoin chan int = make(chan int)
-
-func consumer( channel chan uint64 ) {
-    for {
-        if cons_done { break }
-        <-channel
-    }
-    consJoin <- 0 // synch with main thd
-}
-=======
 channel( size_t ) chan{ 128 };
 thread Consumer {};
 thread Producer {};
->>>>>>> 8421d3fad6379460563c3a8922889a72c4d868fe
 
 void main( Producer & this ) {