Changeset 973a268 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

0806544

Parents:

4c58668

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-23 23:24:21)

git-committer:

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

Message:

cpp: added addressof

File:

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

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

@@ -268 +268 @@
 
     template<class T>
+    T* addressof(T& x) noexcept;
+
+    template<class T>
     class allocator
     {
@@ -301 +304 @@
 
             pointer address(reference x) const noexcept
-            { // TODO: see std::addressof
-                return &x;
+            {
+                return addressof(x);
             }
 
             const_pointer address(const_reference x) const noexcept
-            { // TODO: see std::addressof
-                return &x;
+            {
+                return addressof(x);
             }
 
@@ -373 +376 @@
     template<class T>
     T* addressof(T& x) noexcept
-    { // TODO: This should actually work even with overloaded operator&.
-        return &x;
-    }
+    {
+        return reinterpret_cast<T*>(
+            &const_cast<char&>(
+                reinterpret_cast<const volatile char&>(x)
+        ));
+    }
+
+    template<class Iterator>
+    struct iterator_traits;
 
     template<class InputIterator, class ForwardIterator>