Changeset 35584b19 in mainline for uspace/lib/cpp/include/impl/memory.hpp

Timestamp:

2018-07-05T21:41:17Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

b6d68a3

Parents:

de89870

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-10-22 17:02:19)

git-committer:

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

Message:

cpp: added mostly functioning version of std::vector, but inserts currently reallocate everytime

File:

• uspace/lib/cpp/include/impl/memory.hpp (modified) (4 diffs)

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

@@ -39 +39 @@
      */
 
-    template<class T>
+    template<class Ptr>
     struct pointer_traits
     {
-        // TODO:
+        using pointer = Ptr;
+        // TODO: element type, difference type
+
+        // TODO: this is conditional, see standard
+        template<class U>
+        using rebind = typename Ptr::template rebind<U>;
     };
 
@@ -180 +185 @@
         using pointer = typename aux::get_pointer<Alloc>::type;
         using const_pointer = typename aux::get_const_pointer<Alloc, pointer>::type;
-        using void_pointer = typename aux::get_void_pointer<Alloc, pointer>::type;
-        using const_void_pointer = typename aux::get_const_void_pointer<Alloc, pointer>::type;
+        // TODO: fix void pointer typedefs
+        /* using void_pointer = typename aux::get_void_pointer<Alloc, pointer>::type; */
+        /* using const_void_pointer = typename aux::get_const_void_pointer<Alloc, pointer>::type; */
+        using void_pointer = void*;
+        using const_void_pointer = const void*;
         using difference_type = typename aux::get_difference_type<Alloc, pointer>::type;
         using size_type = typename aux::get_size_type<Alloc, difference_type>::type;
@@ -279 +287 @@
             using is_always_equal                        = true_type;
 
-            allocator() noexcept;
-
-            allocator(const allocator&) noexcept;
+            allocator() noexcept = default;
+
+            allocator(const allocator&) noexcept = default;
 
             template<class U>
-            allocator(const allocator<U>&) noexcept;
+            allocator(const allocator<U>&) noexcept
+            {
+                // TODO: implement
+            }
 
             ~allocator() = default;
@@ -303 +314 @@
                  * Note: The usage of hint is unspecified.
                  *       TODO: Check HelenOS hint allocation capabilities.
+                 * TODO: assert that n < max_size()
                  */
-                return ::operator new(n);
+                return static_cast<pointer>(::operator new(n * sizeof(value_type)));
             }