Changeset c06328da in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

d93f01a6

Parents:

bfa86e5

git-author:

Dzejrou <dzejrou@…> (2018-04-07 15:00:56)

git-committer:

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

Message:

cpp: added move assignment and comparison operator for vector

File:

• uspace/lib/cpp/include/impl/vector.hpp (modified) (9 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -153 +153 @@
                          allocator_traits<Allocator>::is_always_equal::value)
             {
-                // TODO: implement
+                if (data_)
+                    allocator_.deallocate(data_, capacity_);
+
+                // TODO: test this
+                data_ = other.data_;
+                size_ = other.size_;
+                capacity_ = other.capacity_;
+                allocator_ = move(other.allocator_);
+
+                other.data_ = nullptr;
+                other.size_ = size_type{};
+                other.capacity_ = size_type{};
+                other.allocator_ = allocator_type{};
                 return *this;
             }
@@ -370 +382 @@
             }
 
-            // TODO: assert CopyInstertable etc with enable_if!
             void push_back(const T& x)
             {
@@ -584 +595 @@
     bool operator==(const vector<T, Alloc>& lhs, const vector<T, Alloc>& rhs)
     {
-        // TODO: implement
-        return false;
+        if (lhs.size() != rhs.size())
+            return false;
+
+        for (decltype(lhs.size()) i = 0; i < lhs.size(); ++i)
+        {
+            if (lhs[i] != rhs[i])
+                return false;
+        }
+
+        return true;
     }
 
@@ -591 +610 @@
     bool operator<(const vector<T, Alloc>& lhs, const vector<T, Alloc>& rhs)
     {
-        // TODO: implement
-        return false;
+        auto min_size = min(lhs.size(), rhs.size());
+        for (decltype(lhs.size()) i = 0; i < min_size; ++i)
+        {
+            if (lhs[i] >= rhs[i])
+                return false;
+        }
+
+        if (lhs.size() == rhs.size())
+            return true;
+        else
+            return lhs.size() < rhs.size();
     }
 
@@ -604 +632 @@
     bool operator>(const vector<T, Alloc>& lhs, const vector<T, Alloc>& rhs)
     {
-        // TODO: implement
-        return false;
+        return rhs < lhs;
     }
 
@@ -611 +638 @@
     bool operator>=(const vector<T, Alloc>& lhs, const vector<T, Alloc>& rhs)
     {
-        // TODO: implement
-        return false;
+        return !(lhs < rhs);
     }
 
@@ -618 +644 @@
     bool operator<=(const vector<T, Alloc>& lhs, const vector<T, Alloc>& rhs)
     {
-        // TODO: implement
-        return false;
+        return !(rhs < lhs);
     }
 
@@ -631 +656 @@
         lhs.swap(rhs);
     }
+
+    /**
+     * 23.3.7, class vector<bool>:
+     */
+
+    // TODO: implement
 }