Changeset 6d80237 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

db628a0

Parents:

c23f16d8

git-author:

Dzejrou <dzejrou@…> (2018-04-25 18:36:47)

git-committer:

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

Message:

cpp: fixed a compilation error caused by template parameter shadowing

File:

• uspace/lib/cpp/include/impl/unordered_map.hpp (modified) (1 diff)

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

@@ -835 +835 @@
             static constexpr size_type default_bucket_count_{16};
 
-            template<class Key, class Value, class Hash, class Pred, class Alloc>
-            friend bool operator==(unordered_map<Key, Value, Hash, Pred, Alloc>&,
-                                   unordered_map<Key, Value, Hash, Pred, Alloc>&);
+            template<class K, class V, class H, class P, class A>
+            friend bool operator==(unordered_map<K, V, H, P, A>&,
+                                   unordered_map<K, V, H, P, A>&);
     };