Changeset ace2e92

Timestamp:

Sep 21, 2020, 4:43:41 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

08f3ad3, fe94e708

Parents:

0e52f14

Message:

Fix deprecated HAVE_PREADV2/HAVE_PWRITEV2 macros.
Disabled diagnostics for free of non-heap object in futures

Location:

libcfa/src

Files:

• bits/locks.hfa (modified) (1 diff)
• concurrency/io/call.cfa.in (modified) (1 diff)

libcfa/src/bits/locks.hfa

@@ -357 +357 @@
                                 struct oneshot * expected = this.ptr;
                                 // was this abandoned?
-                                if( expected == 3p ) { free( &this ); return false; }
+                                #if defined(__GNUC__) && __GNUC__ >= 7
+                                        #pragma GCC diagnostic push
+                                        #pragma GCC diagnostic ignored "-Wfree-nonheap-object"
+                                #endif
+                                        if( expected == 3p ) { free( &this ); return false; }
+                                #if defined(__GNUC__) && __GNUC__ >= 7
+                                        #pragma GCC diagnostic pop
+                                #endif
 
                                 /* paranoid */ verify( expected != 1p ); // Future is already fulfilled, should not happen

libcfa/src/concurrency/io/call.cfa.in

@@ -109 +109 @@
         #include <sys/syscall.h>
 
-#if defined(HAVE_PREADV2)
+#if defined(CFA_HAVE_PREADV2)
         struct iovec;
         extern ssize_t preadv2 (int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
 #endif
-#if defined(HAVE_PWRITEV2)
+#if defined(CFA_HAVE_PWRITEV2)
         struct iovec;
         extern ssize_t pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);