boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-31 11:57:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check that I'm using link_ptr & bucket_ptr correctly (they should be distinct

Browse Source 
types with an explicit conversion from bucket_ptr to link_ptr).


[SVN r42156]
This commit is contained in:
Daniel James
2007-12-18 23:14:49 +00:00
parent f43a74a93f
commit f1d3797c32
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/unordered/detail/hash_table_impl.hpp
View File

@@ -53,8 +53,28 @@ namespace boost {
typedef BOOST_DEDUCED_TYPENAME allocator_pointer<node_allocator>::type node_ptr; typedef BOOST_DEDUCED_TYPENAME allocator_pointer<node_allocator>::type node_ptr;
typedef BOOST_DEDUCED_TYPENAME allocator_pointer<bucket_allocator>::type bucket_ptr; typedef BOOST_DEDUCED_TYPENAME allocator_pointer<bucket_allocator>::type bucket_ptr;
typedef BOOST_DEDUCED_TYPENAME allocator_reference<value_allocator>::type reference; typedef BOOST_DEDUCED_TYPENAME allocator_reference<value_allocator>::type reference;
typedef bucket_ptr link_ptr; typedef BOOST_DEDUCED_TYPENAME allocator_reference<bucket_allocator>::type bucket_reference;
#if 1
typedef bucket_ptr link_ptr;
#else
// This alternative version of link_ptr is used to check that the
// implementation is type safe wrt bucket_ptr and link_ptr.
//
// It's a sort of strict typedef.
struct link_ptr {
link_ptr() : ptr_() { BOOST_HASH_MSVC_RESET_PTR(ptr_); }
explicit link_ptr(bucket_ptr p) : ptr_(p) {}
bucket_reference operator*() const { return *ptr_; }
bucket* operator->() const { return &*ptr_; }
operator bool() const { return ptr_; }
bool operator==(link_ptr const& x) const { return ptr_ == x.ptr_; }
bool operator!=(link_ptr const& x) const { return ptr_ != x.ptr_; }
private:
bucket_ptr ptr_;
};
#endif
// Hash Bucket // Hash Bucket
// //
// all no throw // all no throw
@@ -207,7 +227,7 @@ namespace boost {
{ {
node_ptr p = node_; node_ptr p = node_;
unordered_detail::reset(node_); unordered_detail::reset(node_);
return allocators_.bucket_alloc_.address(*p); return link_ptr(allocators_.bucket_alloc_.address(*p));
} }
private: private: