|
|
Boost-Commit : |
From: daniel_james_at_[hidden]
Date: 2007-12-20 14:51:22
Author: danieljames
Date: 2007-12-20 14:51:21 EST (Thu, 20 Dec 2007)
New Revision: 42210
URL: http://svn.boost.org/trac/boost/changeset/42210
Log:
Merge in changes.
Properties modified:
branches/unordered/dev/ (props changed)
Text files modified:
branches/unordered/dev/boost/unordered/detail/allocator.hpp | 20 +++++++-------
branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp | 16 +++++-----
branches/unordered/dev/boost/unordered_map.hpp | 56 ++++++++++++++++++++--------------------
branches/unordered/dev/boost/unordered_set.hpp | 56 ++++++++++++++++++++--------------------
4 files changed, 74 insertions(+), 74 deletions(-)
Modified: branches/unordered/dev/boost/unordered/detail/allocator.hpp
==============================================================================
--- branches/unordered/dev/boost/unordered/detail/allocator.hpp (original)
+++ branches/unordered/dev/boost/unordered/detail/allocator.hpp 2007-12-20 14:51:21 EST (Thu, 20 Dec 2007)
@@ -61,27 +61,27 @@
template <class Allocator> struct allocator_value_type
{
- typedef typename Allocator::value_type type;
+ typedef BOOST_DEDUCED_TYPENAME Allocator::value_type type;
};
template <class Allocator> struct allocator_pointer
{
- typedef typename Allocator::pointer type;
+ typedef BOOST_DEDUCED_TYPENAME Allocator::pointer type;
};
template <class Allocator> struct allocator_const_pointer
{
- typedef typename Allocator::const_pointer type;
+ typedef BOOST_DEDUCED_TYPENAME Allocator::const_pointer type;
};
template <class Allocator> struct allocator_reference
{
- typedef typename Allocator::reference type;
+ typedef BOOST_DEDUCED_TYPENAME Allocator::reference type;
};
template <class Allocator> struct allocator_const_reference
{
- typedef typename Allocator::const_reference type;
+ typedef BOOST_DEDUCED_TYPENAME Allocator::const_reference type;
};
#if defined(BOOST_MPL_CFG_MSVC_ETI_BUG)
@@ -121,8 +121,8 @@
template <class Allocator>
struct allocator_constructor
{
- typedef typename Allocator::value_type value_type;
- typedef typename allocator_pointer<Allocator>::type pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_value_type<Allocator>::type value_type;
+ typedef BOOST_DEDUCED_TYPENAME allocator_pointer<Allocator>::type pointer;
Allocator& alloc_;
pointer ptr_;
@@ -168,7 +168,7 @@
{
pointer p = ptr_;
constructed_ = false;
- reset(ptr_);
+ unordered_detail::reset(ptr_);
return p;
}
};
@@ -176,7 +176,7 @@
template <class Allocator>
struct allocator_array_constructor
{
- typedef typename allocator_pointer<Allocator>::type pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_pointer<Allocator>::type pointer;
Allocator& alloc_;
pointer ptr_;
@@ -220,7 +220,7 @@
pointer release()
{
pointer p(ptr_);
- reset(ptr_);
+ unordered_detail::reset(ptr_);
return p;
}
private:
Modified: branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp
==============================================================================
--- branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp (original)
+++ branches/unordered/dev/boost/unordered/detail/hash_table_impl.hpp 2007-12-20 14:51:21 EST (Thu, 20 Dec 2007)
@@ -154,10 +154,10 @@
void swap(allocators& x)
{
- hash_swap(node_alloc_, x.node_alloc_);
- hash_swap(bucket_alloc_, x.bucket_alloc_);
- hash_swap(value_alloc_, x.value_alloc_);
- hash_swap(node_base_alloc_, x.node_base_alloc_);
+ unordered_detail::hash_swap(node_alloc_, x.node_alloc_);
+ unordered_detail::hash_swap(bucket_alloc_, x.bucket_alloc_);
+ unordered_detail::hash_swap(value_alloc_, x.value_alloc_);
+ unordered_detail::hash_swap(node_base_alloc_, x.node_base_alloc_);
}
bool operator==(allocators const& x)
@@ -831,7 +831,7 @@
void clear()
{
- bucket_ptr begin = buckets_;
+ bucket_ptr begin = cached_begin_bucket_;
bucket_ptr end = buckets_ + bucket_count_;
size_ = 0;
@@ -969,9 +969,9 @@
{
typedef BOOST_UNORDERED_TABLE_DATA<Alloc> data;
- typedef typename data::node_constructor node_constructor;
- typedef typename data::bucket_ptr bucket_ptr;
- typedef typename data::link_ptr link_ptr;
+ typedef BOOST_DEDUCED_TYPENAME data::node_constructor node_constructor;
+ typedef BOOST_DEDUCED_TYPENAME data::bucket_ptr bucket_ptr;
+ typedef BOOST_DEDUCED_TYPENAME data::link_ptr link_ptr;
public:
Modified: branches/unordered/dev/boost/unordered_map.hpp
==============================================================================
--- branches/unordered/dev/boost/unordered_map.hpp (original)
+++ branches/unordered/dev/boost/unordered_map.hpp 2007-12-20 14:51:21 EST (Thu, 20 Dec 2007)
@@ -32,7 +32,7 @@
std::pair<const Key, T>, Key, Hash, Pred, Alloc
> implementation;
- typename implementation::hash_table base;
+ BOOST_DEDUCED_TYPENAME implementation::hash_table base;
public:
@@ -45,18 +45,18 @@
typedef Pred key_equal;
typedef Alloc allocator_type;
- typedef typename allocator_type::pointer pointer;
- typedef typename allocator_type::const_pointer const_pointer;
- typedef typename allocator_type::reference reference;
- typedef typename allocator_type::const_reference const_reference;
-
- typedef typename implementation::size_type size_type;
- typedef typename implementation::difference_type difference_type;
-
- typedef typename implementation::iterator iterator;
- typedef typename implementation::const_iterator const_iterator;
- typedef typename implementation::local_iterator local_iterator;
- typedef typename implementation::const_local_iterator const_local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+ typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
// construct/destroy/copy
@@ -88,7 +88,7 @@
private:
- typename implementation::iterator_base const&
+ BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
get(const_iterator const& it)
{
return boost::unordered_detail::iterator_access::get(it);
@@ -360,7 +360,7 @@
std::pair<const Key, T>, Key, Hash, Pred, Alloc
> implementation;
- typename implementation::hash_table base;
+ BOOST_DEDUCED_TYPENAME implementation::hash_table base;
public:
@@ -373,18 +373,18 @@
typedef Pred key_equal;
typedef Alloc allocator_type;
- typedef typename allocator_type::pointer pointer;
- typedef typename allocator_type::const_pointer const_pointer;
- typedef typename allocator_type::reference reference;
- typedef typename allocator_type::const_reference const_reference;
-
- typedef typename implementation::size_type size_type;
- typedef typename implementation::difference_type difference_type;
-
- typedef typename implementation::iterator iterator;
- typedef typename implementation::const_iterator const_iterator;
- typedef typename implementation::local_iterator local_iterator;
- typedef typename implementation::const_local_iterator const_local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+ typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
// construct/destroy/copy
@@ -416,7 +416,7 @@
private:
- typename implementation::iterator_base const&
+ BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
get(const_iterator const& it)
{
return boost::unordered_detail::iterator_access::get(it);
Modified: branches/unordered/dev/boost/unordered_set.hpp
==============================================================================
--- branches/unordered/dev/boost/unordered_set.hpp (original)
+++ branches/unordered/dev/boost/unordered_set.hpp 2007-12-20 14:51:21 EST (Thu, 20 Dec 2007)
@@ -31,7 +31,7 @@
Value, Value, Hash, Pred, Alloc
> implementation;
- typename implementation::hash_table base;
+ BOOST_DEDUCED_TYPENAME implementation::hash_table base;
public:
@@ -43,18 +43,18 @@
typedef Pred key_equal;
typedef Alloc allocator_type;
- typedef typename allocator_type::pointer pointer;
- typedef typename allocator_type::const_pointer const_pointer;
- typedef typename allocator_type::reference reference;
- typedef typename allocator_type::const_reference const_reference;
-
- typedef typename implementation::size_type size_type;
- typedef typename implementation::difference_type difference_type;
-
- typedef typename implementation::const_iterator iterator;
- typedef typename implementation::const_iterator const_iterator;
- typedef typename implementation::const_local_iterator local_iterator;
- typedef typename implementation::const_local_iterator const_local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+ typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
// construct/destroy/copy
@@ -85,7 +85,7 @@
private:
- typename implementation::iterator_base const&
+ BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
get(const_iterator const& it)
{
return boost::unordered_detail::iterator_access::get(it);
@@ -329,7 +329,7 @@
Value, Value, Hash, Pred, Alloc
> implementation;
- typename implementation::hash_table base;
+ BOOST_DEDUCED_TYPENAME implementation::hash_table base;
public:
@@ -341,18 +341,18 @@
typedef Pred key_equal;
typedef Alloc allocator_type;
- typedef typename allocator_type::pointer pointer;
- typedef typename allocator_type::const_pointer const_pointer;
- typedef typename allocator_type::reference reference;
- typedef typename allocator_type::const_reference const_reference;
-
- typedef typename implementation::size_type size_type;
- typedef typename implementation::difference_type difference_type;
-
- typedef typename implementation::const_iterator iterator;
- typedef typename implementation::const_iterator const_iterator;
- typedef typename implementation::const_local_iterator local_iterator;
- typedef typename implementation::const_local_iterator const_local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference;
+ typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type;
+ typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type;
+
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator;
+ typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator;
// construct/destroy/copy
@@ -383,7 +383,7 @@
private:
- typename implementation::iterator_base const&
+ BOOST_DEDUCED_TYPENAME implementation::iterator_base const&
get(const_iterator const& it)
{
return boost::unordered_detail::iterator_access::get(it);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk