[util.smartptr.hash]
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@105393 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/functional b/include/functional
index 57112a2..e645a55 100644
--- a/include/functional
+++ b/include/functional
@@ -1834,16 +1834,7 @@
}
};
-template<class _Tp>
-struct hash<_Tp*>
- : public unary_function<_Tp*, size_t>
-{
- size_t operator()(_Tp* __v) const
- {
- const size_t* const __p = reinterpret_cast<const size_t*>(&__v);
- return *__p;
- }
-};
+// struct hash<T*> in <memory>
_LIBCPP_END_NAMESPACE_STD
diff --git a/include/memory b/include/memory
index 10122c7..8af5ed7 100644
--- a/include/memory
+++ b/include/memory
@@ -2463,6 +2463,31 @@
bool
operator>=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x < __y);}
+template <class> struct hash;
+
+template<class _Tp>
+struct hash<_Tp*>
+ : public unary_function<_Tp*, size_t>
+{
+ size_t operator()(_Tp* __v) const
+ {
+ const size_t* const __p = reinterpret_cast<const size_t*>(&__v);
+ return *__p;
+ }
+};
+
+template <class _Tp, class _Dp>
+struct hash<unique_ptr<_Tp, _Dp> >
+{
+ typedef unique_ptr<_Tp, _Dp> argument_type;
+ typedef size_t result_type;
+ result_type operator()(const argument_type& __ptr) const
+ {
+ typedef typename argument_type::pointer pointer;
+ return hash<pointer>()(__ptr.get());
+ }
+};
+
struct __destruct_n
{
private:
@@ -3785,6 +3810,17 @@
template <class _Up> friend class shared_ptr;
};
+template <class _Tp>
+struct hash<shared_ptr<_Tp> >
+{
+ typedef shared_ptr<_Tp> argument_type;
+ typedef size_t result_type;
+ result_type operator()(const argument_type& __ptr) const
+ {
+ return hash<_Tp*>()(__ptr.get());
+ }
+};
+
//enum class
struct pointer_safety
{
diff --git a/src/mutex.cpp b/src/mutex.cpp
index 7ea7349..1f8160d 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -235,7 +235,7 @@
pthread_mutex_lock(&mut);
flag = 0ul;
pthread_mutex_unlock(&mut);
- pthread_cond_signal(&cv);
+ pthread_cond_broadcast(&cv);
throw;
}
}
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
new file mode 100644
index 0000000..9912d1b
--- /dev/null
+++ b/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
Binary files differ
diff --git a/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp b/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
new file mode 100644
index 0000000..0541e57
--- /dev/null
+++ b/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
Binary files differ
diff --git a/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp b/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp
new file mode 100644
index 0000000..6b7f189
--- /dev/null
+++ b/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp
@@ -0,0 +1,21 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <tuple>
+
+// template<class... Types>
+// tuple<ATypes...> pack_arguments(Types&&... t);
+
+
+#include <tuple>
+
+int main()
+{
+#error pack_arguments not implemented
+}