Update of /cvsroot/boost/boost/libs/interprocess/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1082/test
Modified Files:
allocator_v1.hpp condition_test_template.hpp deque_test.cpp
dummy_test_allocator.hpp expand_bwd_test_allocator.hpp
file_mapping_test.cpp flat_tree_test.cpp Jamfile.v2
message_queue_test.cpp user_buffer_test.cpp vector_test.cpp
Log Message:
no message
Index: allocator_v1.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/allocator_v1.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- allocator_v1.hpp 12 May 2007 12:31:50 -0000 1.3
+++ allocator_v1.hpp 23 Jun 2007 13:01:38 -0000 1.4
@@ -20,7 +20,6 @@
#include <boost/interprocess/interprocess_fwd.hpp>
#include <boost/interprocess/allocators/allocation_type.hpp>
-#include <boost/utility/addressof.hpp>
#include <boost/interprocess/detail/utilities.hpp>
#include <boost/interprocess/detail/version_type.hpp>
#include <boost/interprocess/exceptions.hpp>
@@ -80,10 +79,10 @@
<cvoid_ptr, T>::type pointer;
typedef typename detail::
pointer_to_other<pointer, const T>::type const_pointer;
- 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;
@@ -97,15 +96,15 @@
/*!Returns the segment manager. Never throws*/
segment_manager* get_segment_manager()const
{ return detail::get_pointer(mp_mngr); }
-
- /*!Returns address of mutable object. Never throws*/
+/*
+ //!Returns address of mutable object. Never throws
pointer address(reference value) const
- { return pointer(boost::addressof(value)); }
+ { return pointer(addressof(value)); }
- /*!Returns address of non mutable object. Never throws*/
+ //!Returns address of non mutable object. Never throws
const_pointer address(const_reference value) const
- { return const_pointer(boost::addressof(value)); }
-
+ { return const_pointer(addressof(value)); }
+*/
/*!Constructor from the segment manager. Never throws*/
allocator_v1(segment_manager *segment_mngr)
: mp_mngr(segment_mngr) { }
@@ -127,16 +126,16 @@
/*!Deallocates memory previously allocated. Never throws*/
void deallocate(const pointer &ptr, size_type)
{ mp_mngr->deallocate(detail::get_pointer(ptr)); }
-
- /*!Construct object, calling constructor.
- Throws if T(const T&) throws*/
+/*
+ //!Construct object, calling constructor.
+ //!Throws if T(const T&) throws
void construct(const pointer &ptr, const_reference 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*/
size_type max_size() const
{ return mp_mngr->get_size(); }
Index: condition_test_template.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/interprocess/test/condition_test_template.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- condition_test_template.hpp 12 May 2007 12:31:50 -0000 1.4
+++ condition_test_template.hpp 23 Jun 2007 13:01:38 -0000 1.5
@@ -37,7 +37,7 @@
boost::posix_time::ptime ptime_delay(int secs)
{
- return boost::posix_time::microsec_clock::universal_time() +
+ return microsec_clock::universal_time() +
boost::posix_time::time_duration(0, 0, secs);
}
Index: deque_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/deque_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- deque_test.cpp 12 May 2007 12:31:50 -0000 1.5
+++ deque_test.cpp 23 Jun 2007 13:01:38 -0000 1.6
@@ -27,6 +27,7 @@
#include <boost/interprocess/exceptions.hpp>
#include <boost/interprocess/detail/move_iterator.hpp>
#include <boost/interprocess/detail/move.hpp>
+#include <boost/interprocess/detail/mpl.hpp>
//***************************************************************//
// //
@@ -44,14 +45,14 @@
//Function to check if both sets are equal
template<class V1, class V2>
-bool copyable_only(V1 *, V2 *, boost::false_type)
+bool copyable_only(V1 *, V2 *, detail::false_type)
{
return true;
}
//Function to check if both sets are equal
template<class V1, class V2>
-bool copyable_only(V1 *shmdeque, V2 *stddeque, boost::true_type)
+bool copyable_only(V1 *shmdeque, V2 *stddeque, detail::true_type)
{
typedef typename V1::value_type IntType;
std::size_t size = shmdeque->size();
@@ -174,8 +175,8 @@
}
if(!copyable_only(shmdeque, stddeque
- ,boost::integral_constant
- <bool, !is_movable<IntType>::value>())){
+// ,boost::integral_constant
+ ,detail::bool_<!is_movable<IntType>::value>())){
return false;
}
Index: dummy_test_allocator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/dummy_test_allocator.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dummy_test_allocator.hpp 12 May 2007 12:31:50 -0000 1.3
+++ dummy_test_allocator.hpp 23 Jun 2007 13:01:38 -0000 1.4
@@ -20,7 +20,6 @@
#include <boost/interprocess/interprocess_fwd.hpp>
#include <boost/interprocess/allocators/allocation_type.hpp>
-#include <boost/utility/addressof.hpp>
#include <boost/assert.hpp>
#include <boost/interprocess/detail/utilities.hpp>
#include <boost/interprocess/detail/version_type.hpp>
@@ -59,10 +58,10 @@
typedef T value_type;
typedef T * pointer;
typedef const T * const_pointer;
- typedef typename workaround::random_it
- <T>::reference reference;
- typedef typename workaround::random_it
- <T>::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;
@@ -84,26 +83,26 @@
template<class T2>
dummy_test_allocator(const dummy_test_allocator<T2> &other)
{}
-
- pointer address(reference value) const
- { return pointer(boost::addressof(value)); }
+/*
+ pointer address(reference value)
+ { return pointer(addressof(value)); }
const_pointer address(const_reference value) const
- { return const_pointer(boost::addressof(value)); }
-
+ { return const_pointer(addressof(value)); }
+*/
pointer allocate(size_type, cvoid_ptr = 0)
{ return 0; }
void deallocate(const pointer &, size_type)
{ }
-
+/*
template<class Convertible>
void construct(pointer, const Convertible &)
{}
void destroy(pointer)
{}
-
+*/
size_type max_size() const
{ return 0; }
Index: expand_bwd_test_allocator.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/libs/interprocess/test/expand_bwd_test_allocator.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- expand_bwd_test_allocator.hpp 12 May 2007 12:31:50 -0000 1.5
+++ expand_bwd_test_allocator.hpp 23 Jun 2007 13:01:38 -0000 1.6
@@ -20,7 +20,6 @@
#include <boost/interprocess/interprocess_fwd.hpp>
#include <boost/interprocess/allocators/allocation_type.hpp>
-#include <boost/utility/addressof.hpp>
#include <boost/assert.hpp>
#include <boost/interprocess/detail/utilities.hpp>
#include <boost/interprocess/detail/version_type.hpp>
@@ -61,10 +60,10 @@
typedef T value_type;
typedef T * pointer;
typedef const T * const_pointer;
- typedef typename workaround::random_it
- <T>::reference reference;
- typedef typename workaround::random_it
- <T>::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;
@@ -89,26 +88,26 @@
expand_bwd_test_allocator(const expand_bwd_test_allocator<T2> &other)
: mp_buffer(other.mp_buffer), m_size(other.m_size)
, m_offset(other.m_offset), m_allocations(0){ }
-
- pointer address(reference value) const
- { return pointer(boost::addressof(value)); }
+/*
+ pointer address(reference value)
+ { return pointer(addressof(value)); }
const_pointer address(const_reference value) const
- { return const_pointer(boost::addressof(value)); }
-
+ { return const_pointer(addressof(value)); }
+*/
pointer allocate(size_type , cvoid_ptr hint = 0)
{ (void)hint; return 0; }
void deallocate(const pointer &, size_type)
{}
-
+/*
template<class Convertible>
void construct(pointer ptr, const Convertible &value)
{ new((void*)ptr) value_type(value); }
void destroy(pointer ptr)
{ (*ptr).~value_type(); }
-
+*/
size_type max_size() const
{ return m_size; }
Index: file_mapping_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/file_mapping_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- file_mapping_test.cpp 12 May 2007 12:31:50 -0000 1.5
+++ file_mapping_test.cpp 23 Jun 2007 13:01:38 -0000 1.6
@@ -13,6 +13,7 @@
#include <iostream>
#include <boost/interprocess/file_mapping.hpp>
#include <boost/interprocess/mapped_region.hpp>
+#include <memory>
#include <cstdio>
using namespace boost::interprocess;
Index: flat_tree_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/flat_tree_test.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flat_tree_test.cpp 12 May 2007 12:31:50 -0000 1.4
+++ flat_tree_test.cpp 23 Jun 2007 13:01:38 -0000 1.5
@@ -21,13 +21,13 @@
#include "set_test.hpp"
#include "map_test.hpp"
-/*****************************************************************/
-/* */
-/* This example repeats the same operations with std::set and */
-/* shmem_set using the node allocator */
-/* and compares the values of both containers */
-/* */
-/*****************************************************************/
+/////////////////////////////////////////////////////////////////
+//
+// This example repeats the same operations with std::set and
+// shmem_set using the node allocator
+// and compares the values of both containers
+//
+/////////////////////////////////////////////////////////////////
using namespace boost::interprocess;
@@ -145,15 +145,15 @@
,MyStdMultiMap>()){
return 1;
}
-/*
- if (0 != map_test<my_managed_shared_memory
- ,MyMovableShmMap
- ,MyStdMap
- ,MyMovableShmMultiMap
- ,MyStdMultiMap>()){
- return 1;
- }
-*/
+
+// if (0 != map_test<my_managed_shared_memory
+// ,MyMovableShmMap
+// ,MyStdMap
+// ,MyMovableShmMultiMap
+// ,MyStdMultiMap>()){
+// return 1;
+// }
+
if (0 != map_test<my_managed_shared_memory
,MyMoveCopyShmMap
,MyStdMap
@@ -166,3 +166,17 @@
}
#include <boost/interprocess/detail/config_end.hpp>
+
+/*
+//#include <boost/interprocess/shared_memory_object.hpp>
+//#include <boost/interprocess/detail/posix_time_types_wrk.hpp>
+//#include <boost/operators.hpp>
+*/
+/*
+//#define WIN32_LEAN_AND_MEAN
+//#define BOOST_USE_WINDOWS_H
+#include <boost/date_time/microsec_time_clock.hpp>
+#include <boost/date_time/posix_time/ptime.hpp>
+//#include <boost/shared_ptr.hpp>
+*/
+
Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/Jamfile.v2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Jamfile.v2 4 May 2007 21:17:55 -0000 1.3
+++ Jamfile.v2 23 Jun 2007 13:01:38 -0000 1.4
@@ -31,4 +31,4 @@
return $(all_rules) ;
}
-test-suite interprocess_test : [ test_all r ] ;
+test-suite interprocess_test : [ test_all r ] : <threading>multi ;
Index: message_queue_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/message_queue_test.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- message_queue_test.cpp 12 May 2007 12:31:51 -0000 1.4
+++ message_queue_test.cpp 23 Jun 2007 13:01:38 -0000 1.5
@@ -25,11 +25,11 @@
#undef max
#endif
-/******************************************************************************/
-/*
*/
-/* This example tests the process shared message queue.
*/
-/*
*/
-/******************************************************************************/
+////////////////////////////////////////////////////////////////////////////////
+//
//
+// This example tests the process shared message queue.
//
+//
//
+////////////////////////////////////////////////////////////////////////////////
using namespace boost::interprocess;
Index: user_buffer_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/user_buffer_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- user_buffer_test.cpp 12 May 2007 12:31:51 -0000 1.5
+++ user_buffer_test.cpp 23 Jun 2007 13:01:38 -0000 1.6
@@ -17,7 +17,7 @@
#include <boost/interprocess/managed_external_buffer.hpp>
#include <boost/interprocess/managed_heap_memory.hpp>
#include <boost/interprocess/containers/list.hpp>
-#include <boost/type_traits/type_with_alignment.hpp>
+#include <boost/interprocess/detail/type_traits.hpp>
#include <boost/interprocess/allocators/node_allocator.hpp>
#include "print_container.hpp"
@@ -52,9 +52,9 @@
int main ()
{
//Create the user memory who will store all objects
- const int size_aligner = sizeof(boost::detail::max_align);
+ const int size_aligner = sizeof(detail::max_align);
const int memsize = 65536/size_aligner*size_aligner;
- static boost::detail::max_align static_buffer[memsize/size_aligner];
+ static detail::max_align static_buffer[memsize/size_aligner];
//Named new capable user mem allocator
wmanaged_external_buffer user_buffer(create_only, static_buffer, memsize);
Index: vector_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/interprocess/test/vector_test.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vector_test.cpp 12 May 2007 12:31:51 -0000 1.5
+++ vector_test.cpp 23 Jun 2007 13:01:38 -0000 1.6
@@ -31,7 +31,6 @@
#include "expand_bwd_test_allocator.hpp"
#include "expand_bwd_test_template.hpp"
#include "dummy_test_allocator.hpp"
-#include <boost/type_traits/integral_constant.hpp>
using namespace boost::interprocess;
@@ -46,14 +45,14 @@
test::dummy_test_allocator<test::movable_and_copyable_int> >;
template<class V1, class V2>
-bool copyable_only(V1 *, V2 *, boost::false_type)
+bool copyable_only(V1 *, V2 *, detail::false_type)
{
return true;
}
//Function to check if both sets are equal
template<class V1, class V2>
-bool copyable_only(V1 *shmvector, V2 *stdvector, boost::true_type)
+bool copyable_only(V1 *shmvector, V2 *stdvector, detail::true_type)
{
typedef typename V1::value_type IntType;
std::size_t size = shmvector->size();
@@ -200,8 +199,7 @@
if(!test::CheckEqualContainers(shmvector, stdvector)) return false;
if(!copyable_only(shmvector, stdvector
- ,boost::integral_constant
- <bool, !is_movable<IntType>::value>())){
+ ,detail::bool_<!is_movable<IntType>::value>())){
return false;
}
-------------------------------------------------------------------------
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
