Changeset d9f6d80 for libcfa

Timestamp:

Dec 20, 2024, 3:35:35 PM (9 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

9dc05782

Parents:

77148b0 (diff), 5251c6b (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

Files:

• bits/stack.hfa (modified) (2 diffs)
• concurrency/coroutine.cfa (modified) (1 diff)

libcfa/src/bits/stack.hfa

@@ -14 +14 @@
         };
 
-        inline {
+        static inline {
                 // wrappers to make Collection have T
                 T & head( Stack(T) & s ) with( s ) {
@@ -70 +70 @@
         struct StackIter {
                 inline ColIter;                                                                 // Plan 9 inheritance
-        };      
+        };
 
-        inline {
+        static inline {
                 void ?{}( StackIter(T) & si ) with( si ) {
                         ((ColIter &)si){};

libcfa/src/concurrency/coroutine.cfa

@@ -81 +81 @@
 
 // helper for popping from coroutine's ehm buffer
-inline nonlocal_exception * pop_ehm_head( coroutine$ * this ) {
+static nonlocal_exception * pop_ehm_head( coroutine$ * this ) {
     lock( this->ehm_state.buffer_lock __cfaabi_dbg_ctx2 );
     nonlocal_exception * nl_ex = pop_head( this->ehm_state.ehm_buffer );