Changeset 15d248e for src/Concurrency/Waitfor.cc

Timestamp:

Jan 23, 2018, 1:12:35 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

764b4b2, b6838214

Parents:

84e8423 (diff), 81e1f32 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Concurrency/Waitfor.cc (modified) (1 diff)

src/Concurrency/Waitfor.cc

@@ -507 +507 @@
                         new ListInit({
                                 new SingleInit( new AddressExpr( new VariableExpr( index ) ) ),
-                                new SingleInit( new VariableExpr( acceptables ) ),
-                                new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                new ListInit({
+                                        new SingleInit( new VariableExpr( acceptables ) ),
+                                        new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                })
                         })
                 );