Ignore:
Timestamp:
Jun 24, 2020, 5:00:59 PM (16 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
c953163
Parents:
9791ab5 (diff), 7f9968a (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 relaxed_ready

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/heap.cfa

    r9791ab5 r8b58bae  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed May 27 15:08:49 2020
    13 // Update Count     : 770
     12// Last Modified On : Sat Jun 13 22:42:15 2020
     13// Update Count     : 805
    1414//
    1515
     
    208208
    209209#if BUCKETLOCK == LOCKFREE
    210 static inline Link(HeapManager.Storage) * ?`next( HeapManager.Storage * this ) { return &this->header.kind.real.next; }
    211 static inline void ?{}( HeapManager.FreeHeader & ) {}
    212 static inline void ^?{}( HeapManager.FreeHeader & ) {}
     210static inline {
     211        Link(HeapManager.Storage) * ?`next( HeapManager.Storage * this ) { return &this->header.kind.real.next; }
     212        void ?{}( HeapManager.FreeHeader & ) {}
     213        void ^?{}( HeapManager.FreeHeader & ) {}
     214} // distribution
    213215#endif // LOCKFREE
    214216
Note: See TracChangeset for help on using the changeset viewer.