Changeset 2a301ff for libcfa/src/bits/collections.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• libcfa/src/bits/collections.hfa (moved) (moved from libcfa/src/bits/containers.hfa ) (1 diff)

libcfa/src/bits/collections.hfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// bits/containers.hfa -- Intrusive generic containers.hfa
+// bits/collections.hfa -- Intrusive generic collections
 //
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 16:38:50 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  2 11:33:08 2023
-// Update Count     : 29
+// Last Modified On : Wed Aug 30 21:26:39 2023
+// Update Count     : 30
 
 #pragma once