Update of /cvsroot/boost/boost/boost/interprocess/allocators/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29345/allocators/detail
Modified Files:
adaptive_node_pool.hpp
Log Message:
no message
Index: adaptive_node_pool.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/allocators/detail/adaptive_node_pool.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- adaptive_node_pool.hpp 12 May 2007 12:51:19 -0000 1.2
+++ adaptive_node_pool.hpp 23 Jun 2007 12:51:56 -0000 1.3
@@ -25,8 +25,7 @@
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/slist.hpp>
#include <boost/math/common_factor_ct.hpp>
-#include <boost/type_traits/alignment_of.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
+#include <boost/interprocess/detail/type_traits.hpp>
#include <boost/interprocess/allocators/detail/node_tools.hpp>
#include <cstddef>
#include <cassert>
@@ -77,7 +76,7 @@
typedef boost::intrusive::list
<typename list_hook_t::template value_traits<chunk_info_t> >
chunk_list_t;
- enum { Alignment = boost::alignment_of<boost::detail::max_align>::value
};
+ enum { Alignment = detail::alignment_of<detail::max_align>::value };
enum { RealNodeSize =
boost::math::static_lcm<NodeSize, sizeof(node_t)>::value };
enum { HeaderSize =
ct_min<detail::ct_rounded_size<sizeof(chunk_info_t), Alignment>::value
@@ -274,7 +273,7 @@
assert(m_allocated==0);
priv_invariants();
m_first_free_chunk = m_chunk_list.end();
- m_chunk_list.clear_and_destroy
+ m_chunk_list.clear_and_dispose
(chunk_destroyer(detail::get_pointer(mp_segment_mngr)));
m_free_chunks = 0;
}
@@ -373,7 +372,7 @@
chunk_iterator it(--m_chunk_list.end());
if(it == m_first_free_chunk)
++m_first_free_chunk; //m_first_free_chunk is now equal to end()
- m_chunk_list.erase_and_destroy(it,
chunk_destroyer(detail::get_pointer(mp_segment_mngr)));
+ m_chunk_list.erase_and_dispose(it,
chunk_destroyer(detail::get_pointer(mp_segment_mngr)));
--m_free_chunks;
}
}
-------------------------------------------------------------------------
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
