Console Output
00:05:54
00:05:54 <p>- Changes -------------------------------------------------------------</p>
00:05:54
00:05:54 <pre>
00:05:54 The branch null has been updated.
00:05:54 from ded6c2a6bdba49106fabf9dcce740d46ecec4b7f (commit)
00:05:54 </pre>
00:05:54
00:05:54 <p>- Log -----------------------------------------------------------------</p>
00:05:54
00:05:54 <pre>
00:05:54 commit ded6c2a6bdba49106fabf9dcce740d46ecec4b7f
00:05:54 Author: caparson <caparson@uwaterloo.ca>
00:05:54
00:05:54 fixed build failure
00:05:54
00:05:54 commit 251ce804bfa9c794ec6fdf5d077a6553e6d749a4
00:05:54 Author: Fangren Yu <f37yu@plg.uwaterloo.ca>
00:05:54
00:05:54 remove reference to symbol table in unify
00:05:54
00:05:54 commit 1803d4daea73b18182327e284198d177f555c261
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 forgot to include this file in previous commit
00:05:54
00:05:54 commit 5eb9327cbe30fcf29a61ce74aa2eaec4c1f20c09
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 updated plot layout in benchmark scripts
00:05:54
00:05:54 commit 760c88c6666fec96edab654022cc390baaac9b20
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 added some citation and waituntil chapter draft up until performance section
00:05:54
00:05:54 commit 3eeeb882cd93a559b38bb056d7f65d5cef6675fc
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 added utility functions for channel exceptions
00:05:54
00:05:54 commit e4a2198dbb207c25b12e2fdc443185658cff7e48
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 worked through Peter's changes to channel chapter
00:05:54
00:05:54 commit 4897ffa5e2466ff9a784f13e117f1ccf68403830
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 fixed merge
00:05:54
00:05:54 commit 0aef54988a056cb7811cb355c108a70531e7f89a
00:05:54 Merge: ac5d22ff6 8421d3fad
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc
00:05:54
00:05:54 commit 8421d3fad6379460563c3a8922889a72c4d868fe
00:05:54 Merge: 6f774be1d 5d81edb37
00:05:54 Author: caparson <caparson@uwaterloo.ca>
00:05:54
00:05:54 Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc
00:05:54
00:05:54 commit 6f774be1d5e97d459b38dc756b61b836cddc73f0
00:05:54 Author: caparson <caparson@uwaterloo.ca>
00:05:54
00:05:54 fixed bug where waituntil deadlock could occur
00:05:54
00:05:54 commit ac5d22ff6401d69fd9e66053891a31797dda9946
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 commit before pull to resolve merge conflicts
00:05:54
00:05:54 commit 22f2b7d3027e8d8daa7328d2dd229d765fc12333
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 missed including in previous commits
00:05:54
00:05:54 commit fc0996a0f6e251a465119fb1a55c0e0e49ebb126
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 refactores to account for removal of ret val from on_selected
00:05:54
00:05:54 commit 70a4ed597ca91ea033ad12b47d5b35b67e10d5ec
00:05:54 Author: caparsons <caparson@uwaterloo.ca>
00:05:54
00:05:54 refactored to remove return val from on_selected
00:05:54 </pre>
00:05:54
00:05:54 <p>-----------------------------------------------------------------------</p>
00:05:54 <pre>
00:05:54 Summary of changes:
00:05:54 .../benchmarks/actors/plotData.py | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 .../benchmarks/channels/plotData.py | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 .../benchmarks/mutex_stmt/plotData.py | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 doc/theses/colby_parsons_MMAth/local.bib | 85 <span style="color: #00AA00;">+++++</span><span style="color: #AA0000;">-</span>
00:05:54 doc/theses/colby_parsons_MMAth/text/channels.tex | 17 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 doc/theses/colby_parsons_MMAth/text/waituntil.tex | 324 <span style="color: #00AA00;">++++++++++++++++++++</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/bits/weakso_locks.cfa | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/bits/weakso_locks.hfa | 4 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/concurrency/channel.hfa | 40 <span style="color: #00AA00;">++</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/concurrency/future.hfa | 6 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/concurrency/locks.cfa | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/concurrency/locks.hfa | 6 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/concurrency/select.cfa | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 libcfa/src/concurrency/select.hfa | 36 <span style="color: #00AA00;">++</span><span style="color: #AA0000;">-</span>
00:05:54 src/AST/SymbolTable.cpp | 4 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/AST/TypeEnvironment.cpp | 23 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/AST/TypeEnvironment.hpp | 11 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/Concurrency/Waituntil.cpp | 28 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/GenPoly/InstantiateGenericNew.cpp | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/GenPoly/LvalueNew.cpp | 11 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/InitTweak/InitTweak.cc | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/CandidateFinder.cpp | 18 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/CastCost.cc | 4 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/CommonType.cc | 98 <span style="color: #00AA00;">++</span><span style="color: #AA0000;">-----</span>
00:05:54 src/ResolvExpr/CommonType.hpp | 3 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/ConversionCost.cc | 8 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/Resolver.cc | 5 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/SatisfyAssertions.cpp | 6 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/ResolvExpr/Unify.cc | 87 <span style="color: #00AA00;">+++</span><span style="color: #AA0000;">---</span>
00:05:54 src/ResolvExpr/Unify.h | 12 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 src/Validate/ReplaceTypedef.cpp | 2 <span style="color: #00AA00;">+</span><span style="color: #AA0000;">-</span>
00:05:54 31 files changed, 615 insertions(+), 239 deletions(-)
00:05:54 </pre>
00:05:54
![[Jenkins]](/jenkins/static/24bcefeb/images/svgs/logo.svg){kind=logo}
