Changeset 999cb48 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

edd2e61

Parents:

aedae28

git-author:

Dzejrou <dzejrou@…> (2018-05-10 00:36:39)

git-committer:

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

Message:

cpp: added hash support for smart pointers

Location:

uspace/lib/cpp/include

Files:

• impl/memory.hpp (modified) (2 diffs)
• internal/memory/shared_ptr.hpp (modified) (2 diffs)

uspace/lib/cpp/include/impl/memory.hpp

@@ -31 +31 @@
 
 #include <internal/aux.hpp>
+#include <internal/functional/hash.hpp>
 #include <internal/memory/allocator_arg.hpp>
 #include <internal/memory/addressof.hpp>
@@ -1098 +1099 @@
         return !(nullptr < ptr);
     }
+
+    /**
+     * 20.8.2.7, smart pointer hash support:
+     */
+
+    template<class T, class D>
+    struct hash<unique_ptr<T, D>>
+    {
+        size_t operator()(const unique_ptr<T, D>& ptr) const noexcept
+        {
+            return hash<typename unique_ptr<T, D>::pointer>{}(ptr.get());
+        }
+
+        using argument_type = unique_ptr<T, D>;
+        using result_type   = size_t;
+    };
 }
 

uspace/lib/cpp/include/internal/memory/shared_ptr.hpp

@@ -32 +32 @@
 #include <exception>
 #include <internal/functional/arithmetic_operations.hpp>
+#include <internal/functional/hash.hpp>
 #include <internal/memory/allocator_arg.hpp>
 #include <internal/memory/shared_payload.hpp>
@@ -605 +606 @@
         return os << ptr.get();
     }
+
+    /**
+     * 20.8.2.5, class template enable_shared_from_this:
+     */
+
+    // TODO: implement
+
+    /**
+     * 20.8.2.6, shared_ptr atomic access
+     */
+
+    // TODO: implement
+
+    /**
+     * 20.8.2.7, smart pointer hash support:
+     */
+
+    template<class T>
+    struct hash<shared_ptr<T>>
+    {
+        size_t operator()(const shared_ptr<T>& ptr) const noexcept
+        {
+            return hash<T*>{}(ptr.get());
+        }
+
+        using argument_type = shared_ptr<T>;
+        using result_type   = size_t;
+    };
 }