Changeset f67b4ef in mainline

Timestamp:

2018-07-05T21:41:21Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7320ca6

Parents:

e9027b5

git-author:

Dzejrou <dzejrou@…> (2018-04-23 19:58:10)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:21)

Message:

cpp: removed the allocator trick, map allocator is for the pair, not the value

File:

• uspace/lib/cpp/include/internal/hash_table.hpp (modified) (3 diffs)

uspace/lib/cpp/include/internal/hash_table.hpp

@@ -68 +68 @@
     };
 
-    struct key_value_allocator
-    { /* DUMMY BODY */ };
-
     template<class Value, class Size>
     struct hash_table_bucket
@@ -695 +692 @@
             iterator emplace(Allocator& alloc, Args&&... args)
             {
-                // TODO: use allocator traits of allocator_type but pass alloc!
-                // TODO: also, try_emplace should be one level above (we don't know
-                //       keys)
+                // TODO: implement
             }
 
@@ -956 +951 @@
 }
 
-namespace std
-{
-    template<>
-    struct allocator_traits<aux::key_value_allocator>
-    {
-        template<class Alloc, class Key, class Value, class... Args>
-        static void construct(Alloc& alloc, pair<Key, Value>* ptr, Args&&... args)
-        {
-            alloc.construct(&ptr->second, forward<Args>(args)...);
-        }
-    };
-}
-
 #endif