Changeset 3623f9d

Timestamp:

Jun 24, 2019, 4:11:33 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3e2f5e3

Parents:

da7454c

Message:

Fixed warning in libcfa

Location:

libcfa/src

Files:

• bits/containers.hfa (modified) (4 diffs)
• concurrency/coroutine.cfa (modified) (1 diff)
• concurrency/invoke.h (modified) (1 diff)

libcfa/src/bits/containers.hfa

@@ -78 +78 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | is_node(TYPE))
+        forall(dtype TYPE)
         #define T TYPE
 #else
@@ -95 +95 @@
 
 #ifdef __cforall
-        forall(dtype T | is_node(T))
+        forall(dtype T)
         static inline void ?{}( __stack(T) & this ) {
                 (this.top){ NULL };
@@ -122 +122 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | is_node(TYPE))
+        forall(dtype TYPE)
         #define T TYPE
 #else
@@ -141 +141 @@
 #ifdef __cforall
 
-        forall(dtype T | is_node(T))
+        forall(dtype T)
         static inline void ?{}( __queue(T) & this ) with( this ) {
                 head{ NULL };

libcfa/src/concurrency/coroutine.cfa

@@ -98 +98 @@
 
 void ^?{}(coroutine_desc& this) {
-        if(this.state != Halted && this.state != Start) {
+        if(this.state != Halted && this.state != Start && this.state != Primed) {
                 coroutine_desc * src = TL_GET( this_thread )->curr_cor;
                 coroutine_desc * dst = &this;

libcfa/src/concurrency/invoke.h

@@ -46 +46 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct thread_desc             *& get_next( struct thread_desc             & this );
-                static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
-
                 extern thread_local struct KernelThreadData {
                         struct thread_desc    * volatile this_thread;