Changeset f041811 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

56521a2

Parents:

604038c

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-10-24 19:30:27)

git-committer:

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

Message:

cpp: fixed minor bugs

Location:

uspace/lib/cpp/include/impl

Files:

• algorithm.hpp (modified) (1 diff)
• iterator.hpp (modified) (9 diffs)
• utility.hpp (modified) (1 diff)

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

@@ -30 +30 @@
 #define LIBCPP_ALGORITHM
 
+#include <iterator>
 #include <utility>
 

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

@@ -30 +30 @@
 #define LIBCPP_ITERATOR
 
+#include <cstdlib>
+
 namespace std
 {
@@ -118 +120 @@
         public:
             using iterator_type   = Iterator;
-            using difference_type = typename Iterator::difference_type;
-            using reference       = typename Iterator::reference;
-            using pointer         = typename Iterator::pointer;
+            using difference_type = typename iterator_traits<Iterator>::difference_type;
+            using reference       = typename iterator_traits<Iterator>::reference;
+            using pointer         = typename iterator_traits<Iterator>::pointer;
 
             reverse_iterator()
@@ -229 +231 @@
                     const reverse_iterator<Iterator2>& rhs)
     {
-        return lhs.current_ == rhs.current_;
+        return lhs.base() == rhs.base();
     }
 
     template<class Iterator1, class Iterator2>
     bool operator<(const reverse_iterator<Iterator1>& lhs,
-                    const reverse_iterator<Iterator2>& rhs)
+                   const reverse_iterator<Iterator2>& rhs)
     {
         // Remember: they are reversed!
-        return lhs.current_ > rhs.current_;
+        return lhs.base() > rhs.base();
     }
 
@@ -244 +246 @@
                     const reverse_iterator<Iterator2>& rhs)
     {
-        return lhs.current_ != rhs.current_;
+        return lhs.base() != rhs.base();
     }
 
@@ -251 +253 @@
                     const reverse_iterator<Iterator2>& rhs)
     {
-        return lhs.current_ < rhs.current_;
+        return lhs.base() < rhs.base();
     }
 
@@ -258 +260 @@
                     const reverse_iterator<Iterator2>& rhs)
     {
-        return lhs.current_ <= rhs.current_;
+        return lhs.base() <= rhs.base();
     }
 
@@ -265 +267 @@
                     const reverse_iterator<Iterator2>& rhs)
     {
-        return lhs.current_ >= rhs.current_;
+        return lhs.base() >= rhs.base();
     }
 
@@ -273 +275 @@
         -> decltype(rhs.base() - lhs.base())
     {
-        return rhs.current_ - lhs.current_;
+        return rhs.base() - lhs.base();
     }
 
@@ -282 +284 @@
     )
     {
-        return reverse_iterator<Iterator>{it.current_ - n};
+        return reverse_iterator<Iterator>{it.base() - n};
     }
 

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

@@ -38 +38 @@
      */
 
-    template<typename T>
-    bool operator!=(const T& lhs, const T& rhs)
-    {
-        return !(lhs == rhs);
-    }
-
-    template<typename T>
-    bool operator>(const T& lhs, const T& rhs)
-    {
-        return (rhs < lhs);
-    }
-
-    template<typename T>
-    bool operator<=(const T& lhs, const T& rhs)
-    {
-        return !(rhs < lhs);
-    }
-
-    template<typename T>
-    bool operator>=(const T& lhs, const T& rhs)
-    {
-        return !(lhs < rhs);
+    namespace rel_ops
+    {
+        template<typename T>
+        bool operator!=(const T& lhs, const T& rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        template<typename T>
+        bool operator>(const T& lhs, const T& rhs)
+        {
+            return (rhs < lhs);
+        }
+
+        template<typename T>
+        bool operator<=(const T& lhs, const T& rhs)
+        {
+            return !(rhs < lhs);
+        }
+
+        template<typename T>
+        bool operator>=(const T& lhs, const T& rhs)
+        {
+            return !(lhs < rhs);
+        }
     }