Update of /cvsroot/boost/boost/boost/interprocess/allocators
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29834/allocators
Modified Files:
node_allocator.hpp private_adaptive_pool.hpp
private_node_allocator.hpp
Log Message:
no message
Index: node_allocator.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/allocators/node_allocator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- node_allocator.hpp 12 Jun 2007 17:07:07 -0000 1.6
+++ node_allocator.hpp 23 Jun 2007 12:53:00 -0000 1.7
@@ -19,9 +19,6 @@
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/interprocess/interprocess_fwd.hpp>
-#include <boost/utility/addressof.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/config.hpp>
#include <boost/assert.hpp>
#include <boost/interprocess/detail/utilities.hpp>
#include <boost/interprocess/detail/workaround.hpp>
@@ -68,10 +65,10 @@
typedef typename detail::
pointer_to_other<void_pointer, const T>::type const_pointer;
typedef T value_type;
- typedef typename workaround::random_it
- <value_type>::reference reference;
- typedef typename workaround::random_it
- <value_type>::const_reference const_reference;
+ typedef typename detail::add_reference
+ <value_type>::type reference;
+ typedef typename detail::add_reference
+ <const value_type>::type const_reference;
typedef std::size_t size_type;
typedef std::ptrdiff_t difference_type;
@@ -138,31 +135,31 @@
(detail::get_pointer(mp_node_pool));
return node_pool->get_segment_manager();
}
-
- /*!Return address of mutable value. Never throws*/
+/*
+ //!Return address of mutable value. Never throws
pointer address(reference value) const
- { return pointer(boost::addressof(value)); }
+ { return pointer(addressof(value)); }
- /*!Return address of nonmutable value. Never throws*/
+ //!Return address of nonmutable value. Never throws
const_pointer address(const_reference value) const
- { return const_pointer(boost::addressof(value)); }
+ { return const_pointer(addressof(value)); }
- /*!Construct object, calling constructor.
- Throws if T(const Convertible &) throws*/
+ //!Construct object, calling constructor.
+ //!Throws if T(const Convertible &) throws
template<class Convertible>
void construct(const pointer &ptr, const Convertible &value)
{ new(detail::get_pointer(ptr)) value_type(value); }
- /*!Destroys object. Throws if object's destructor throws*/
+ //!Destroys object. Throws if object's destructor throws
void destroy(const pointer &ptr)
{ BOOST_ASSERT(ptr != 0); (*ptr).~value_type(); }
-
- /*!Returns the number of elements that could be allocated. Never throws*/
+*/
+ //!Returns the number of elements that could be allocated. Never throws
size_type max_size() const
{ return this->get_segment_manager()->get_size()/sizeof(value_type); }
- /*!Allocate memory for an array of count elements.
- Throws boost::interprocess::bad_alloc if there is no enough memory*/
+ //!Allocate memory for an array of count elements.
+ //!Throws boost::interprocess::bad_alloc if there is no enough memory
pointer allocate(size_type count, cvoid_pointer = 0)
{
if(count > ((size_type)-1)/sizeof(value_type))
Index: private_adaptive_pool.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/allocators/private_adaptive_pool.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- private_adaptive_pool.hpp 12 Jun 2007 17:07:07 -0000 1.3
+++ private_adaptive_pool.hpp 23 Jun 2007 12:53:00 -0000 1.4
@@ -19,9 +19,6 @@
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/interprocess/interprocess_fwd.hpp>
-#include <boost/utility/addressof.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/config.hpp>
#include <boost/assert.hpp>
#include <boost/interprocess/allocators/detail/adaptive_node_pool.hpp>
#include <boost/interprocess/exceptions.hpp>
@@ -69,10 +66,10 @@
typedef typename detail::
pointer_to_other<void_pointer, const T>::type const_pointer;
typedef T value_type;
- typedef typename workaround::random_it
- <value_type>::reference reference;
- typedef typename workaround::random_it
- <value_type>::const_reference const_reference;
+ typedef typename detail::add_reference
+ <value_type>::type reference;
+ typedef typename detail::add_reference
+ <const value_type>::type const_reference;
typedef std::size_t size_type;
typedef std::ptrdiff_t difference_type;
@@ -141,14 +138,14 @@
//!Returns the segment manager. Never throws
segment_manager* get_segment_manager()const
{ return detail::get_pointer(mp_segment_mngr); }
-
+/*
//!Return address of mutable value. Never throws
pointer address(reference value) const
- { return pointer(boost::addressof(value)); }
+ { return pointer(addressof(value)); }
//!Return address of non mutable value. Never throws
const_pointer address(const_reference value) const
- { return const_pointer(boost::addressof(value)); }
+ { return const_pointer(addressof(value)); }
//!Construct object, calling constructor.
//!Throws if T(const Convertible &) throws
@@ -159,8 +156,7 @@
//!Destroys object. Throws if object's destructor throws
void destroy(const pointer &ptr)
{ BOOST_ASSERT(ptr != 0); (*ptr).~value_type(); }
-
-
+*/
//!Returns the number of elements that could be allocated. Never throws
size_type max_size() const
{ return mp_segment_mngr->get_size()/sizeof(value_type); }
Index: private_node_allocator.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/allocators/private_node_allocator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- private_node_allocator.hpp 12 Jun 2007 17:07:07 -0000 1.5
+++ private_node_allocator.hpp 23 Jun 2007 12:53:00 -0000 1.6
@@ -19,9 +19,6 @@
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/interprocess/interprocess_fwd.hpp>
-#include <boost/utility/addressof.hpp>
-#include <boost/detail/workaround.hpp>
-#include <boost/config.hpp>
#include <boost/assert.hpp>
#include <boost/interprocess/allocators/detail/node_pool.hpp>
#include <boost/interprocess/exceptions.hpp>
@@ -70,10 +67,10 @@
typedef typename detail::
pointer_to_other<void_pointer, const T>::type const_pointer;
typedef T value_type;
- typedef typename workaround::random_it
- <value_type>::reference reference;
- typedef typename workaround::random_it
- <value_type>::const_reference const_reference;
+ typedef typename detail::add_reference
+ <value_type>::type reference;
+ typedef typename detail::add_reference
+ <const value_type>::type const_reference;
typedef std::size_t size_type;
typedef std::ptrdiff_t difference_type;
@@ -143,14 +140,14 @@
//!Returns the segment manager. Never throws
segment_manager* get_segment_manager()const
{ return detail::get_pointer(mp_segment_mngr); }
-
+/*
//!Return address of mutable value. Never throws
pointer address(reference value) const
- { return pointer(boost::addressof(value)); }
+ { return pointer(addressof(value)); }
//!Return address of non mutable value. Never throws
const_pointer address(const_reference value) const
- { return const_pointer(boost::addressof(value)); }
+ { return const_pointer(addressof(value)); }
//!Construct object, calling constructor.
//!Throws if T(const Convertible &) throws
@@ -161,7 +158,7 @@
//!Destroys object. Throws if object's destructor throws
void destroy(const pointer &ptr)
{ BOOST_ASSERT(ptr != 0); (*ptr).~value_type(); }
-
+*/
//!Returns the number of elements that could be allocated. Never throws
size_type max_size() const
{ return mp_segment_mngr->get_size()/sizeof(value_type); }
-------------------------------------------------------------------------
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
