Changeset 614b07e in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

bdc981b

Parents:

c866a83

git-author:

Dzejrou <dzejrou@…> (2018-05-05 17:19:00)

git-committer:

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

Message:

cpp: moved addressof to an internal header to avoid circular dependencies, added temporary buffers and raw storage iterator

Location:

uspace/lib/cpp/include

Files:

• impl/iterator.hpp (modified) (1 diff)
• impl/memory.hpp (modified) (3 diffs)
• internal/memory/addressof.hpp (added)
• memory (modified) (1 diff)

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

@@ -32 +32 @@
 #include <cstdlib>
 #include <initializer_list>
+#include <internal/memory/addressof.hpp>
 #include <iosfwd>
-#include <memory>
 #include <type_traits>
 #include <utility>

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

@@ -31 +31 @@
 
 #include <internal/aux.hpp>
+#include <internal/memory/addressof.hpp>
+#include <iterator>
 #include <new>
 #include <type_traits>
@@ -398 +400 @@
      */
 
-    // TODO: implement
+    template<class OutputIterator, class T>
+    class raw_storage_iterator: public iterator<output_iterator_tag, void, void, void, void>
+    {
+        public:
+            explicit raw_storage_iterator(OutputIterator it)
+                : it_{it}
+            { /* DUMMY BODY */ }
+
+            raw_storage_iterator& operator*()
+            {
+                return *this;
+            }
+
+            raw_storage_iterator& operator=(const T& element)
+            {
+                new(it_) T{element};
+
+                return *this;
+            }
+
+            raw_storage_iterator& operator++()
+            {
+                ++it_;
+
+                return *this;
+            }
+
+            raw_storage_iterator operator++(int)
+            {
+                return raw_storage_iterator{it_++};
+            }
+
+        private:
+            OutputIterator it_;
+    };
 
     /**
@@ -404 +440 @@
      */
 
-    // TODO: implement
+    template<class T>
+    pair<T*, ptrdiff_t> get_temporary_buffer(ptrdiff_t n) noexcept
+    {
+        T* res{};
+
+        while (n > 0)
+        {
+            res = (T*)malloc(n * sizeof(T));
+
+            if (res)
+                return make_pair(res, n);
+
+            --n;
+        }
+
+        return make_pair(nullptr, ptrdiff_t{});
+    }
+
+    template<class T>
+    void return_temporary_buffer(T* ptr)
+    {
+        free(ptr);
+    }
 
     /**
      * 20.7.12, specialized algorithms:
      */
-
-    template<class T>
-    T* addressof(T& x) noexcept
-    {
-        return reinterpret_cast<T*>(
-            &const_cast<char&>(
-                reinterpret_cast<const volatile char&>(x)
-        ));
-    }
 
     template<class Iterator>

uspace/lib/cpp/include/memory

@@ -28 +28 @@
 
 #include <impl/memory.hpp>
+#include <internal/memory/addressof.hpp>