Update of /cvsroot/boost/boost/boost/intrusive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20331
Modified Files:
circular_list_algorithms.hpp circular_slist_algorithms.hpp
hashtable.hpp intrusive_fwd.hpp linking_policy.hpp list.hpp
list_hook.hpp pointer_plus_bit.hpp rbtree.hpp
rbtree_algorithms.hpp set.hpp set_hook.hpp slist.hpp
slist_hook.hpp tag.hpp unordered_set.hpp
unordered_set_hook.hpp
Log Message:
Changes to correct regression tests for intel-win-9.1 & cw-9.4
Index: circular_list_algorithms.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/circular_list_algorithms.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- circular_list_algorithms.hpp 4 May 2007 21:22:01 -0000 1.1
+++ circular_list_algorithms.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -18,9 +18,7 @@
#include <iterator>
#include <boost/assert.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
-#include <boost/get_pointer.hpp>
#include <cstddef>
namespace boost {
Index: circular_slist_algorithms.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/circular_slist_algorithms.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- circular_slist_algorithms.hpp 4 May 2007 21:22:01 -0000 1.1
+++ circular_slist_algorithms.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -18,9 +18,7 @@
#include <iterator>
#include <boost/assert.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
-#include <boost/get_pointer.hpp>
#include <cstddef>
namespace boost {
Index: hashtable.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/hashtable.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hashtable.hpp 4 May 2007 21:22:02 -0000 1.1
+++ hashtable.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -26,7 +26,6 @@
#include <boost/functional/hash.hpp>
//General intrusive utilities
#include <boost/intrusive/intrusive_fwd.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/hashtable_node.hpp>
#include <boost/intrusive/linking_policy.hpp>
@@ -143,14 +142,12 @@
static node_ptr uncast(const_node_ptr ptr)
{
- using boost::get_pointer;
- return node_ptr(const_cast<node*>(get_pointer(ptr)));
+ return node_ptr(const_cast<node*>(detail::get_pointer(ptr)));
}
static bucket_info_ptr uncast(const_bucket_info_ptr ptr)
{
- using boost::get_pointer;
- return bucket_info_ptr(const_cast<bucket_info_t*>(get_pointer(ptr)));
+ return
bucket_info_ptr(const_cast<bucket_info_t*>(detail::get_pointer(ptr)));
}
static slist_impl &bucket_to_slist(bucket_type &b)
@@ -204,8 +201,7 @@
iterator end()
{
- using boost::get_pointer;
- bucket_info_t *info = get_pointer(this->priv_bucket_info());
+ bucket_info_t *info = detail::get_pointer(this->priv_bucket_info());
return iterator(invalid_local_it(*info), 0);
}
@@ -214,8 +210,7 @@
const_iterator cend() const
{
- using boost::get_pointer;
- const bucket_info_t *info = get_pointer(this->priv_bucket_info());
+ const bucket_info_t *info =
detail::get_pointer(this->priv_bucket_info());
return const_iterator(invalid_local_it(*info), 0);
}
@@ -231,9 +226,8 @@
return !size();
}
else{
- using boost::get_pointer;
size_type buckets_len = this->priv_buckets_len();
- const bucket_type *b = get_pointer(this->priv_buckets());
+ const bucket_type *b = detail::get_pointer(this->priv_buckets());
for (size_type n = 0; n < buckets_len; ++n, ++b){
if(!b->empty()){
return false;
@@ -249,9 +243,8 @@
return size_traits::get_size();
else{
size_type len = 0;
- using boost::get_pointer;
size_type buckets_len = this->priv_buckets_len();
- const bucket_type *b = get_pointer(this->priv_buckets());
+ const bucket_type *b = detail::get_pointer(this->priv_buckets());
for (size_type n = 0; n < buckets_len; ++n, ++b){
len += b->size();
}
Index: intrusive_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/intrusive_fwd.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- intrusive_fwd.hpp 4 May 2007 21:22:02 -0000 1.1
+++ intrusive_fwd.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2007
+// (C) Copyright Ion Gaztanaga 2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
Index: linking_policy.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/linking_policy.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linking_policy.hpp 4 May 2007 21:22:02 -0000 1.1
+++ linking_policy.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
Index: list.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/list.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- list.hpp 4 May 2007 21:22:02 -0000 1.1
+++ list.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -20,10 +20,8 @@
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/list_hook.hpp>
#include <boost/intrusive/circular_list_algorithms.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/linking_policy.hpp>
-#include <boost/get_pointer.hpp>
#include <boost/static_assert.hpp>
#include <iterator>
#include <algorithm>
@@ -97,8 +95,8 @@
//Const cast emulation for smart pointers
static node_ptr uncast(const_node_ptr ptr)
{
- using boost::get_pointer;
- return node_ptr(const_cast<node*>(get_pointer(ptr)));
+ //return node_ptr(detail::get_pointer(ptr)));
+ return const_cast<node*>(detail::get_pointer(ptr));
}
node_ptr get_root_node()
Index: list_hook.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/list_hook.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- list_hook.hpp 4 May 2007 21:22:02 -0000 1.1
+++ list_hook.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,13 +17,11 @@
#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/detail/utilities.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/list_node.hpp>
#include <boost/intrusive/circular_list_algorithms.hpp>
#include <boost/intrusive/linking_policy.hpp>
#include <boost/intrusive/tag.hpp>
-#include <boost/get_pointer.hpp>
#include <boost/static_assert.hpp>
#include <stdexcept>
@@ -186,8 +184,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return this_type_ptr(static_cast<list_base_hook*> (get_pointer(p)));
+ return this_type_ptr(static_cast<list_base_hook*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -196,8 +193,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr(static_cast<const list_base_hook*>
(get_pointer(p)));
+ return const_this_type_ptr(static_cast<const list_base_hook*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
@@ -365,8 +361,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return this_type_ptr(static_cast<this_type*> (get_pointer(p)));
+ return this_type_ptr(static_cast<this_type*> (detail::get_pointer(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -375,8 +370,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr(static_cast<const this_type*>
(get_pointer(p)));
+ return const_this_type_ptr(static_cast<const this_type*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
Index: pointer_plus_bit.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/pointer_plus_bit.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pointer_plus_bit.hpp 4 May 2007 21:22:02 -0000 1.1
+++ pointer_plus_bit.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2007
+// (C) Copyright Ion Gaztanaga 2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
Index: rbtree.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/rbtree.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rbtree.hpp 4 May 2007 21:22:02 -0000 1.1
+++ rbtree.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -20,7 +20,6 @@
#include <boost/assert.hpp>
#include <boost/static_assert.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/set_hook.hpp>
#include <boost/intrusive/detail/rbtree_node.hpp>
@@ -107,8 +106,7 @@
static node_ptr uncast(const_node_ptr ptr)
{
- using boost::get_pointer;
- return node_ptr(const_cast<node*>(get_pointer(ptr)));
+ return node_ptr(const_cast<node*>(detail::get_pointer(ptr)));
}
/// @endcond
@@ -271,9 +269,8 @@
//! <b>Complexity</b>: Constant.
static rbtree &container_from_end_iterator(iterator end_iterator)
{
- using boost::get_pointer;
- return *detail::parent_from_member
- ( members_t::this_from_node(get_pointer(end_iterator.pointed_node()))
+ return *detail::parent_from_member<rbtree, members_t>
+ (
members_t::this_from_node(detail::get_pointer(end_iterator.pointed_node()))
, &rbtree::members_);
}
@@ -287,9 +284,8 @@
//! <b>Complexity</b>: Constant.
static const rbtree &container_from_end_iterator(const_iterator
end_iterator)
{
- using boost::get_pointer;
- return *detail::parent_from_member
- ( members_t::this_from_node(get_pointer(end_iterator.pointed_node()))
+ return *detail::parent_from_member<rbtree, members_t>
+ (
members_t::this_from_node(detail::get_pointer(end_iterator.pointed_node()))
, &rbtree::members_);
}
Index: rbtree_algorithms.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/rbtree_algorithms.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rbtree_algorithms.hpp 4 May 2007 21:22:02 -0000 1.1
+++ rbtree_algorithms.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007.
+// (C) Copyright Ion Gaztanaga 2006-2007.
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -43,12 +43,11 @@
#include <iterator>
#include <boost/assert.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
-#include <boost/get_pointer.hpp>
#include <boost/type_traits/alignment_of.hpp>
#include <cstddef>
#include <boost/detail/no_exceptions_support.hpp>
+#include <boost/interprocess/detail/utilities.hpp>
namespace boost {
@@ -916,8 +915,7 @@
private:
static node_ptr uncast(const_node_ptr ptr)
{
- using boost::get_pointer;
- return node_ptr(const_cast<node*>(get_pointer(ptr)));
+ return node_ptr(const_cast<node*>(detail::get_pointer(ptr)));
}
//! <b>Requires</b>: z is the node to be inserted, par is its parent,
Index: set.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/set.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- set.hpp 4 May 2007 21:22:02 -0000 1.1
+++ set.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -234,7 +234,7 @@
//! <b>Complexity</b>: Constant.
static set &container_from_end_iterator(iterator end_iterator)
{
- return *detail::parent_from_member
+ return *detail::parent_from_member<set, tree_type>
( &tree_type::container_from_end_iterator(end_iterator)
, &set::tree_);
}
@@ -249,7 +249,7 @@
//! <b>Complexity</b>: Constant.
static const set &container_from_end_iterator(const_iterator end_iterator)
{
- return *detail::parent_from_member
+ return *detail::parent_from_member<set, tree_type>
( &tree_type::container_from_end_iterator(end_iterator)
, &set::tree_);
}
@@ -1126,7 +1126,7 @@
//! <b>Complexity</b>: Constant.
static multiset &container_from_end_iterator(iterator end_iterator)
{
- return *detail::parent_from_member
+ return *detail::parent_from_member<multiset, tree_type>
( &tree_type::container_from_end_iterator(end_iterator)
, &multiset::tree_);
}
@@ -1141,7 +1141,7 @@
//! <b>Complexity</b>: Constant.
static const multiset &container_from_end_iterator(const_iterator
end_iterator)
{
- return *detail::parent_from_member
+ return *detail::parent_from_member<multiset, tree_type>
( &tree_type::container_from_end_iterator(end_iterator)
, &multiset::tree_);
}
Index: set_hook.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/set_hook.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- set_hook.hpp 4 May 2007 21:22:02 -0000 1.1
+++ set_hook.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,13 +17,11 @@
#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/detail/utilities.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/rbtree_node.hpp>
#include <boost/intrusive/rbtree_algorithms.hpp>
#include <boost/intrusive/linking_policy.hpp>
#include <boost/intrusive/tag.hpp>
-#include <boost/get_pointer.hpp>
#include <boost/static_assert.hpp>
#include <stdexcept>
@@ -174,8 +172,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return this_type_ptr(static_cast<set_base_hook*> (get_pointer(p)));
+ return this_type_ptr(static_cast<set_base_hook*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -184,8 +181,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr(static_cast<const set_base_hook*>
(get_pointer(p)));
+ return const_this_type_ptr(static_cast<const set_base_hook*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
@@ -332,8 +328,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return this_type_ptr(static_cast<this_type*> (get_pointer(p)));
+ return this_type_ptr(static_cast<this_type*> (detail::get_pointer(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -342,8 +337,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr(static_cast<const this_type*>
(get_pointer(p)));
+ return const_this_type_ptr(static_cast<const this_type*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
Index: slist.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/slist.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- slist.hpp 4 May 2007 21:22:02 -0000 1.1
+++ slist.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -22,7 +22,6 @@
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/slist_hook.hpp>
#include <boost/intrusive/circular_slist_algorithms.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/linking_policy.hpp>
#include <iterator>
@@ -112,8 +111,7 @@
static node_ptr uncast(const_node_ptr ptr)
{
- using boost::get_pointer;
- return node_ptr(const_cast<node*>(get_pointer(ptr)));
+ return node_ptr(const_cast<node*>(detail::get_pointer(ptr)));
}
static iterator previous_node(iterator beg, iterator i)
Index: slist_hook.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/slist_hook.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- slist_hook.hpp 4 May 2007 21:22:02 -0000 1.1
+++ slist_hook.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,13 +17,11 @@
#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/detail/utilities.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/detail/slist_node.hpp>
#include <boost/intrusive/circular_slist_algorithms.hpp>
#include <boost/intrusive/linking_policy.hpp>
#include <boost/intrusive/tag.hpp>
-#include <boost/get_pointer.hpp>
#include <boost/static_assert.hpp>
#include <stdexcept>
@@ -189,8 +187,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return this_type_ptr(static_cast<slist_base_hook*> (get_pointer(p)));
+ return this_type_ptr(static_cast<slist_base_hook*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -199,8 +196,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr(static_cast<const slist_base_hook*>
(get_pointer(p)));
+ return const_this_type_ptr(static_cast<const slist_base_hook*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
@@ -372,8 +368,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return this_type_ptr(static_cast<this_type*> (get_pointer(p)));
+ return this_type_ptr(static_cast<this_type*> (detail::get_pointer(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -382,8 +377,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr(static_cast<const this_type*>
(get_pointer(p)));
+ return const_this_type_ptr(static_cast<const this_type*>
(detail::get_pointer(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
Index: tag.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/tag.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tag.hpp 4 May 2007 21:22:02 -0000 1.1
+++ tag.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
Index: unordered_set.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/unordered_set.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unordered_set.hpp 4 May 2007 21:22:02 -0000 1.1
+++ unordered_set.hpp 12 May 2007 12:52:31 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
Index: unordered_set_hook.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/intrusive/unordered_set_hook.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unordered_set_hook.hpp 4 May 2007 21:22:02 -0000 1.1
+++ unordered_set_hook.hpp 12 May 2007 12:52:32 -0000 1.2
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
-// (C) Copyright Ion Gaztañaga 2006-2007
+// (C) Copyright Ion Gaztanaga 2006-2007
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,11 +17,9 @@
#include <boost/intrusive/detail/config_begin.hpp>
#include <boost/intrusive/intrusive_fwd.hpp>
#include <boost/intrusive/detail/utilities.hpp>
-#include <boost/intrusive/detail/pointer_type.hpp>
#include <boost/intrusive/detail/pointer_to_other.hpp>
#include <boost/intrusive/slist_hook.hpp>
#include <boost/intrusive/linking_policy.hpp>
-#include <boost/get_pointer.hpp>
#include <stdexcept>
namespace boost {
@@ -133,8 +131,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return
this_type_ptr((this_type*)get_pointer(IsListHook::to_hook_ptr(p)));
+ return
this_type_ptr((this_type*)detail::get_pointer(IsListHook::to_hook_ptr(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -143,8 +140,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr((const
this_type*)get_pointer(IsListHook::to_hook_ptr(p)));
+ return const_this_type_ptr((const
this_type*)detail::get_pointer(IsListHook::to_hook_ptr(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
@@ -262,8 +258,7 @@
//! <b>Throws</b>: Nothing.
static this_type_ptr to_hook_ptr(node_ptr p)
{
- using boost::get_pointer;
- return
this_type_ptr((this_type*)get_pointer(IsListHook::to_hook_ptr(p)));
+ return
this_type_ptr((this_type*)detail::get_pointer(IsListHook::to_hook_ptr(p)));
}
//! <b>Effects</b>: Converts a const pointer to a node stored in a
container into
@@ -272,8 +267,7 @@
//! <b>Throws</b>: Nothing.
static const_this_type_ptr to_hook_ptr(const_node_ptr p)
{
- using boost::get_pointer;
- return const_this_type_ptr((const
this_type*)get_pointer(IsListHook::to_hook_ptr(p)));
+ return const_this_type_ptr((const
this_type*)detail::get_pointer(IsListHook::to_hook_ptr(p)));
}
//! <b>Effects</b>: Returns a pointer to the node that this hook holds.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
