Changeset 46c7668 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

323ae805

Parents:

c7d7368

git-author:

Dzejrou <dzejrou@…> (2018-05-14 23:04:30)

git-committer:

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

Message:

cpp: fixed enable_ifs

File:

• uspace/lib/cpp/include/impl/unordered_map.hpp (modified) (5 diffs)

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

@@ -266 +266 @@
             template<class T>
             pair<iterator, bool> insert(
-                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val)
+                T&& val,
+                enable_if_t<is_constructible_v<value_type, T&&>>* = nullptr
+            )
             {
                 return emplace(forward<T>(val));
@@ -284 +286 @@
             iterator insert(
                 const_iterator hint,
-                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val
+                T&& val,
+                enable_if_t<is_constructible_v<value_type, T&&>>* = nullptr
             )
             {
@@ -940 +943 @@
             template<class T>
             iterator insert(
-                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val
+                T&& val,
+                enable_if_t<is_constructible_v<value_type, T&&>>* = nullptr
             )
             {
@@ -959 +963 @@
             iterator insert(
                 const_iterator hint,
-                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val
+                T&& val,
+                enable_if_t<is_constructible_v<value_type, T&&>>* = nullptr
             )
             {
@@ -1160 +1165 @@
                     unordered_map<Key, Value, Hash, Pred, Alloc>& rhs)
     {
+        // TODO: this does not compare values, use is_permutation when we have it
         return lhs.table_.is_eq_to(rhs.table_);
     }