Changeset 8a9a3ab for libcfa/src/concurrency

Timestamp:

Sep 1, 2023, 3:54:42 PM (13 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

4b30318b

Parents:

4269d1b (diff), 4c0fa03 (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

Location:

libcfa/src/concurrency

Files:

• alarm.hfa (modified) (2 diffs)
• invoke.h (modified) (2 diffs)
• kernel.hfa (modified) (2 diffs)
• locks.hfa (modified) (1 diff)
• once.hfa (modified) (1 diff)
• select.hfa (modified) (1 diff)

libcfa/src/concurrency/alarm.hfa

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 26 16:25:41 2018
-// Update Count     : 11
+// Last Modified On : Wed Aug 30 21:27:40 2023
+// Update Count     : 12
 //
 
@@ -23 +23 @@
 #include "time.hfa"
 
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 
 struct thread$;

libcfa/src/concurrency/invoke.h

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 14 13:39:31 2023
-// Update Count     : 59
+// Last Modified On : Wed Aug 30 21:27:51 2023
+// Update Count     : 60
 //
 
 // No not use #pragma once was this file is included twice in some places. It has its own guard system.
 
-#include "bits/containers.hfa"
+#include "bits/collections.hfa"
 #include "bits/defs.hfa"
 #include "bits/locks.hfa"
@@ -23 +23 @@
 
 #ifdef __cforall
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 extern "C" {
 #endif

libcfa/src/concurrency/kernel.hfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 12:29:26 2020
-// Update Count     : 22
+// Last Modified On : Wed Aug 30 21:28:46 2023
+// Update Count     : 23
 //
 
@@ -20 +20 @@
 #include "coroutine.hfa"
 
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 
 extern "C" {

libcfa/src/concurrency/locks.hfa

@@ -21 +21 @@
 
 #include "bits/weakso_locks.hfa"
-#include "containers/lockfree.hfa"
-#include "containers/list.hfa"
+#include "collections/lockfree.hfa"
+#include "collections/list.hfa"
 
 #include "limits.hfa"

libcfa/src/concurrency/once.hfa

@@ -16 +16 @@
 #pragma once
 
-#include "containers/lockfree.hfa"
+#include "collections/lockfree.hfa"
 #include "kernel/fwd.hfa"
 

libcfa/src/concurrency/select.hfa

@@ -17 +17 @@
 #pragma once
 
-#include "containers/list.hfa"
+#include "collections/list.hfa"
 #include "alarm.hfa"
 #include "kernel.hfa"