Changeset 0dc954b


Ignore:
Timestamp:
Oct 31, 2017, 2:09:43 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
4 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/bits/algorithms.h

    r6c7b1e7 r0dc954b  
    112112static inline void __libcfa_small_sortN( void* * arr, size_t dim );
    113113
    114 forall( otype T | {  int ?<?( T, T ); int ?>?( T, T ); } )
    115 static inline void __libcfa_small_sort( T * arr, size_t dim ) {
     114forall( dtype T )
     115static inline void __libcfa_small_sort( T* * arr, size_t dim ) {
    116116        switch( dim ) {
    117117                case 1 : return;
  • src/libcfa/stdlib

    r6c7b1e7 r0dc954b  
    1010// Created On       : Thu Jan 28 17:12:35 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Oct 30 22:43:03 2017
    13 // Update Count     : 244
     12// Last Modified On : Tue Oct 31 13:47:24 2017
     13// Update Count     : 245
    1414//
    1515
  • src/tests/sched-ext-recurse.c

    r6c7b1e7 r0dc954b  
    2323        for (i = 0; i < 4; i++)
    2424        {
    25             int j = random( 4 );
     25                int j = random( 4 );
    2626                enum state_t t = array[j];
    2727                array[j] = array[i];
  • src/tests/sched-int-wait.c

    r6c7b1e7 r0dc954b  
    6262
    6363        while( waiter_left != 0 ) {
    64             unsigned action = random( 4 );
     64                unsigned action = random( 4 );
    6565                switch( action ) {
    6666                        case 0:
Note: See TracChangeset for help on using the changeset viewer.