Changeset 0dc954b

Timestamp:

Oct 31, 2017, 2:09:43 PM (6 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

Location:

src

Files:

• libcfa/bits/algorithms.h (modified) (1 diff)
• libcfa/stdlib (modified) (1 diff)
• tests/sched-ext-recurse.c (modified) (1 diff)
• tests/sched-int-wait.c (modified) (1 diff)

src/libcfa/bits/algorithms.h

@@ -112 +112 @@
 static inline void __libcfa_small_sortN( void* * arr, size_t dim );
 
-forall( otype T | {  int ?<?( T, T ); int ?>?( T, T ); } )
-static inline void __libcfa_small_sort( T * arr, size_t dim ) {
+forall( dtype T )
+static inline void __libcfa_small_sort( T* * arr, size_t dim ) {
         switch( dim ) {
                 case 1 : return;

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 22:43:03 2017
-// Update Count     : 244
+// Last Modified On : Tue Oct 31 13:47:24 2017
+// Update Count     : 245
 //
 

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];

src/tests/sched-int-wait.c

@@ -62 +62 @@
 
         while( waiter_left != 0 ) {
-            unsigned action = random( 4 );
+                unsigned action = random( 4 );
                 switch( action ) {
                         case 0: