Changeset ae267366 for libcfa

Timestamp:

Feb 24, 2023, 3:31:50 PM (14 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

2e77837

Parents:

f883ef1 (diff), f2a1cd2 (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:

fix merge conflict

Location:

libcfa/src

Files:

• concurrency/kernel/cluster.hfa (modified) (1 diff)
• interpose.cfa (modified) (2 diffs)
• limits.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/cluster.hfa

@@ -146 +146 @@
 }
 
-static struct {
-        const unsigned readyq;
-        const unsigned io;
+const static struct {
+        unsigned readyq;
+        unsigned io;
 } __shard_factor = { 2, 1 };
 

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb 19 20:44:32 2023
-// Update Count     : 184
+// Last Modified On : Fri Feb 24 15:31:03 2023
+// Update Count     : 185
 //
 
@@ -101 +101 @@
                 preload_libgcc();
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
+                #pragma GCC diagnostic push
+                #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
                 INTERPOSE_LIBC( abort, version );
                 INTERPOSE_LIBC( exit , version );
-#pragma GCC diagnostic pop
+                #pragma GCC diagnostic pop
 
                 if(__cfathreadabi_interpose_startup) __cfathreadabi_interpose_startup( do_interpose_symbol );

libcfa/src/limits.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  8 18:53:17 2023
-// Update Count     : 86
+// Last Modified On : Fri Feb 17 12:25:39 2023
+// Update Count     : 87
 //
 
-// need _GNU_SOURCE to access long double M_*l in math.h
 #include <limits.h>
 #include <float.h>