Changeset 2a301ff for libcfa/src/bits/algorithm.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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 conflict

File:

• libcfa/src/bits/algorithm.hfa (modified) (8 diffs)

libcfa/src/bits/algorithm.hfa

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Oct 30 13:37:34 2017
-// Last Modified By : --
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 08:25:29 2023
+// Update Count     : 3
 //
 
@@ -17 +17 @@
 
 #ifdef SAFE_SORT
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort2( T * arr );
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort3( T * arr );
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort4( T * arr );
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort5( T * arr );
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort6( T * arr );
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sortN( T * arr, size_t dim );
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort2( T * arr );
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort3( T * arr );
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort4( T * arr );
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort5( T * arr );
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sort6( T * arr );
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } ) static inline void __libcfa_small_sortN( T * arr, size_t dim );
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sort( T * arr, size_t dim ) {
         switch( dim ) {
@@ -41 +41 @@
 #define SWAP(x,y) { T a = min(arr[x], arr[y]); T b = max(arr[x], arr[y]); arr[x] = a; arr[y] = b;}
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sort2( T * arr ) {
         SWAP(0, 1);
 }
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sort3( T * arr ) {
         SWAP(1, 2);
@@ -53 +53 @@
 }
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sort4( T * arr ) {
         SWAP(0, 1);
@@ -62 +62 @@
 }
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sort5( T * arr ) {
         SWAP(0, 1);
@@ -75 +75 @@
 }
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sort6( T * arr ) {
         SWAP(1, 2);
@@ -91 +91 @@
 }
 
-forall( T | {  int ?<?( T, T ); int ?>?( T, T ); } )
+forall( T | { int ?<?( T, T ); int ?>?( T, T ); } )
 static inline void __libcfa_small_sortN( T * arr, size_t dim ) {
-        int i, j;
-        for (i = 1; i < dim; i++) {
+        for ( i; 1 ~ dim ) {
                 T tmp = arr[i];
-                for (j = i; j >= 1 && tmp < arr[j-1]; j--) {
+                int j;
+                for ( j = i; j >= 1 && tmp < arr[j-1]; j--) {
                         arr[j] = arr[j-1];
                 }
@@ -175 +175 @@
 
 static inline void __libcfa_small_sortN( void* * arr, size_t dim ) {
-        int i, j;
-        for (i = 1; i < dim; i++) {
-                void* tmp = arr[i];
+        for ( i; 1 ~ dim ) {
+                void * tmp = arr[i];
+                int j;
                 for (j = i; j >= 1 && tmp < arr[j-1]; j--) {
                         arr[j] = arr[j-1];