Changeset 0dc954b for src/tests/sched-ext-recurse.c

Timestamp:

Oct 31, 2017, 2:09:43 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

b1e68d03, e706bfd

Parents:

6c7b1e7 (diff), e1e8408 (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:

resolve conflicts

File:

• src/tests/sched-ext-recurse.c (modified) (1 diff)

src/tests/sched-ext-recurse.c

@@ -23 +23 @@
         for (i = 0; i < 4; i++)
         {
-            int j = random( 4 );
+                int j = random( 4 );
                 enum state_t t = array[j];
                 array[j] = array[i];