[cfe-commits] [libcxx] r105393 - in /libcxx/trunk: include/functional include/memory src/mutex.cpp test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp
Howard Hinnant
hhinnant at apple.com
Thu Jun 3 09:42:57 PDT 2010
Author: hhinnant
Date: Thu Jun 3 11:42:57 2010
New Revision: 105393
URL: http://llvm.org/viewvc/llvm-project?rev=105393&view=rev
Log:
[util.smartptr.hash]
Added:
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp
Modified:
libcxx/trunk/include/functional
libcxx/trunk/include/memory
libcxx/trunk/src/mutex.cpp
Modified: libcxx/trunk/include/functional
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/functional?rev=105393&r1=105392&r2=105393&view=diff
==============================================================================
--- libcxx/trunk/include/functional (original)
+++ libcxx/trunk/include/functional Thu Jun 3 11:42:57 2010
@@ -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
Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=105393&r1=105392&r2=105393&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Thu Jun 3 11:42:57 2010
@@ -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
{
Modified: libcxx/trunk/src/mutex.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/mutex.cpp?rev=105393&r1=105392&r2=105393&view=diff
==============================================================================
--- libcxx/trunk/src/mutex.cpp (original)
+++ libcxx/trunk/src/mutex.cpp Thu Jun 3 11:42:57 2010
@@ -235,7 +235,7 @@
pthread_mutex_lock(&mut);
flag = 0ul;
pthread_mutex_unlock(&mut);
- pthread_cond_signal(&cv);
+ pthread_cond_broadcast(&cv);
throw;
}
}
Added: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp?rev=105393&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp (added)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp Thu Jun 3 11:42:57 2010
@@ -0,0 +1 @@
+//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <memory>
// template <class T>
// struct hash<shared_ptr<T>>
// {
// typedef shared_ptr<T> argument_type;
// typedef size_t result_type;
// size_t operator()(const shared_ptr<T>& p) const;
// };
#include <memory>
#include <cassert>
int main()
{
int* ptr = new int;
std::shared_ptr<int> p(ptr);
std::hash<std::shared_ptr<int> > f;
std::size_t h = f(p);
assert(h == std::hash<int*>()(ptr));
}
\ No newline at end of file
Added: libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp?rev=105393&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp (added)
+++ libcxx/trunk/test/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp Thu Jun 3 11:42:57 2010
@@ -0,0 +1 @@
+//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <memory>
// template <class T, class D>
// struct hash<unique_ptr<T, D>>
// {
// typedef unique_ptr<T, D> argument_type;
// typedef size_t result_type;
// size_t operator()(const unique_ptr<T, D>& p) const;
// };
#include <memory>
#include <cassert>
int main()
{
int* ptr = new int;
std::unique_ptr<int> p(ptr);
std::hash<std::unique_ptr<int> > f;
std::size_t h = f(p);
assert(h == std::hash<int*>()(ptr));
}
\ No newline at end of file
Added: libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp?rev=105393&view=auto
==============================================================================
--- libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp (added)
+++ libcxx/trunk/test/utilities/tuple/tuple.tuple/tuple.creation/pack_arguments.pass.cpp Thu Jun 3 11:42:57 2010
@@ -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
+}
More information about the cfe-commits
mailing list