Changeset 0893dd23 in mainline for uspace/lib/cpp/include/impl/unordered_map.hpp

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

55d6223

Parents:

bd2baf8

git-author:

Dzejrou <dzejrou@…> (2018-04-30 21:19:52)

git-committer:

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

Message:

cpp: fixed enable_ifs

File:

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

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

@@ -264 +264 @@
             }
 
-            template<
-                class T,
-                class = enable_if_t<is_constructible_v<value_type, T&&>, void>
-            >
-            pair<iterator, bool> insert(T&& val)
+            template<class T>
+            pair<iterator, bool> insert(
+                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val)
             {
                 return emplace(forward<T>(val));
@@ -283 +281 @@
             }
 
-            template<
-                class T,
-                class = enable_if_t<is_constructible_v<value_type, T&&>, void>
-            >
-            iterator insert(const_iterator hint, T&& val)
+            template<class T>
+            iterator insert(
+                const_iterator hint,
+                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val
+            )
             {
                 return emplace_hint(hint, forward<T>(val));
@@ -940 +938 @@
             }
 
-            template<
-                class T,
-                class = enable_if_t<is_constructible_v<value_type, T&&>, void>
-            >
-            iterator insert(T&& val)
+            template<class T>
+            iterator insert(
+                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val
+            )
             {
                 return emplace(forward<T>(val));
@@ -959 +956 @@
             }
 
-            template<
-                class T,
-                class = enable_if_t<is_constructible_v<value_type, T&&>, void>
-            >
-            iterator insert(const_iterator hint, T&& val)
+            template<class T>
+            iterator insert(
+                const_iterator hint,
+                enable_if_t<is_constructible_v<value_type, T&&>, T&&> val
+            )
             {
                 return emplace_hint(hint, forward<T>(val));