Changeset 7b3a6e6 for libcfa/src/bits/locks.hfa

Timestamp:

Aug 14, 2018, 1:21:19 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

5a5d31a

Parents:

ef2eade (diff), 0e0f128c (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' into jenkins-sandbox

File:

• libcfa/src/bits/locks.hfa (modified) (3 diffs)

libcfa/src/bits/locks.hfa

@@ -10 +10 @@
 // Created On       : Tue Oct 31 15:14:38 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 18:18:13 2018
-// Update Count     : 9
+// Last Modified On : Sat Aug 11 15:42:24 2018
+// Update Count     : 10
 //
 
@@ -50 +50 @@
         struct {
                 // Align lock on 128-bit boundary
-                __ALIGN__ volatile _Bool lock;
+                __ALIGN__ volatile bool lock;
         };
         #ifdef __CFA_DEBUG__
@@ -79 +79 @@
 
         // Lock the spinlock, return false if already acquired
-        static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
-                _Bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
+        static inline bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
+                bool result = (this.lock == 0) && (__atomic_test_and_set( &this.lock, __ATOMIC_ACQUIRE ) == 0);
                 if( result ) {
                         disable_interrupts();