Changeset ad47ec4 for libcfa

Timestamp:

Aug 29, 2024, 2:38:39 PM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

9bb6c5f

Parents:

960665c (diff), b965774 (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:software/cfa/cfa-cc

File:

• libcfa/src/common.hfa (modified) (3 diffs)

libcfa/src/common.hfa

@@ -10 +10 @@
 // Created On       : Wed Jul 11 17:54:36 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 14 17:01:47 2023
-// Update Count     : 38
+// Last Modified On : Sat Aug 24 08:01:36 2024
+// Update Count     : 43
 //
 
@@ -66 +66 @@
 
 static inline __attribute__((always_inline)) {
-        forall( T | { int ?<?( T, T ); } )
-        T min( T v1, T v2 ) { return v1 < v2 ? v1 : v2; }
-
-        forall( T, Ts... | { T min( T, T ); T min( T, T, Ts ); } )
-        T min( T v1, T v2, T v3, Ts vs ) { return min( min( v1, v2 ), v3, vs ); }
-
-        forall( T | { int ?>?( T, T ); } )
-        T max( T v1, T v2 ) { return v1 > v2 ? v1 : v2; }
-
-        forall( T, Ts... | { T max( T, T ); T max( T, T, Ts ); } )
-        T max( T v1, T v2, T v3, Ts vs ) { return max( max( v1, v2 ), v3, vs ); }
-
-        forall( T | { T min( T, T ); T max( T, T ); } )
-        T clamp( T value, T min_val, T max_val ) { return max( min_val, min( value, max_val ) ); }
-
-        forall( T )
-        void swap( T & v1, T & v2 ) { T temp = v1; v1 = v2; v2 = temp; }
-
         // Specializations
         char min( char v1, char v2 ) { return v1 < v2 ? v1 : v2; }
@@ -100 +82 @@
         long long int max( long long int v1, long long int v2 ) { return v1 > v2 ? v1 : v2; }
         unsigned long long int max( unsigned long long int v1, unsigned long long int v2 ) { return v1 > v2 ? v1 : v2; }
+
+        // Polymorphic
+        forall( T | { int ?<?( T, T ); } )
+        T min( T v1, T v2 ) { return v1 < v2 ? v1 : v2; }
+
+        forall( T, Ts ... | { T min( T, T ); T min( Ts ); } )
+        T min( T arg, Ts args ) { return min( arg, min( args ) ); }
+
+        forall( T | { int ?>?( T, T ); } )
+        T max( T v1, T v2 ) { return v1 > v2 ? v1 : v2; }
+
+        forall( T, Ts ... | { T max( T, T ); T max( Ts ); } )
+        T max( T arg, Ts args ) { return max( arg, max( args ) ); }
+
+        forall( T | { T min( T, T ); T max( T, T ); } )
+        T clamp( T value, T min_val, T max_val ) { return max( min_val, min( value, max_val ) ); }
+
+        forall( T )
+        void swap( T & v1, T & v2 ) { T temp = v1; v1 = v2; v2 = temp; }
 } // distribution