Changeset 08f3ad3 for libcfa/src/bits/locks.hfa

Timestamp:

Sep 21, 2020, 11:37:28 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7a80113

Parents:

31a6f38 (diff), ace2e92 (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 into master

File:

• libcfa/src/bits/locks.hfa (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