Update of /cvsroot/boost/boost/boost/interprocess
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21347
Modified Files:
interprocess_fwd.hpp managed_external_buffer.hpp
managed_heap_memory.hpp managed_mapped_file.hpp
managed_shared_memory.hpp managed_windows_shared_memory.hpp
mapped_region.hpp
Log Message:
New Interprocess version
Index: interprocess_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/interprocess_fwd.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- interprocess_fwd.hpp 23 Jun 2007 12:52:18 -0000 1.5
+++ interprocess_fwd.hpp 22 Jul 2007 14:04:17 -0000 1.6
@@ -116,13 +116,13 @@
template<class T, class SegmentManager, std::size_t NodesPerChunk = 64>
class cached_node_allocator;
-template<class T, class SegmentManager, std::size_t NodesPerChunk = 64,
std::size_t MaxFreeNodes = 2>
+template<class T, class SegmentManager, std::size_t NodesPerChunk = 64,
std::size_t MaxFreeChunks = 2>
class adaptive_pool;
-template<class T, class SegmentManager, std::size_t NodesPerChunk = 64,
std::size_t MaxFreeNodes = 2>
+template<class T, class SegmentManager, std::size_t NodesPerChunk = 64,
std::size_t MaxFreeChunks = 2>
class private_adaptive_pool;
-template<class T, class SegmentManager, std::size_t NodesPerChunk = 64,
std::size_t MaxFreeNodes = 2>
+template<class T, class SegmentManager, std::size_t NodesPerChunk = 64,
std::size_t MaxFreeChunks = 2>
class cached_adaptive_pool;
Index: managed_external_buffer.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/managed_external_buffer.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- managed_external_buffer.hpp 12 Jun 2007 17:07:09 -0000 1.6
+++ managed_external_buffer.hpp 22 Jul 2007 14:04:18 -0000 1.7
@@ -17,7 +17,7 @@
#include <boost/interprocess/detail/config_begin.hpp>
#include <boost/interprocess/detail/workaround.hpp>
-#include <boost/interprocess/detail/creation_tags.hpp>
+#include <boost/interprocess/creation_tags.hpp>
#include <boost/interprocess/detail/managed_memory_impl.hpp>
#include <boost/interprocess/detail/move.hpp>
@@ -48,7 +48,7 @@
public:
//!Creates and places the segment manager. This can throw
basic_managed_external_buffer
- (detail::create_only_t, void *addr, std::size_t size)
+ (create_only_t, void *addr, std::size_t size)
{
if(!base_t::create_impl(addr, size)){
throw interprocess_exception();
@@ -57,7 +57,7 @@
//!Creates and places the segment manager. This can throw
basic_managed_external_buffer
- (detail::open_only_t, void *addr, std::size_t size)
+ (open_only_t, void *addr, std::size_t size)
{
if(!base_t::open_impl(addr, size)){
throw interprocess_exception();//return false;
Index: managed_heap_memory.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/managed_heap_memory.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- managed_heap_memory.hpp 12 Jun 2007 17:07:09 -0000 1.5
+++ managed_heap_memory.hpp 22 Jul 2007 14:04:19 -0000 1.6
@@ -17,7 +17,7 @@
#include <boost/interprocess/detail/config_begin.hpp>
#include <boost/interprocess/detail/workaround.hpp>
-#include <boost/interprocess/detail/creation_tags.hpp>
+#include <boost/interprocess/creation_tags.hpp>
#include <boost/interprocess/detail/move.hpp>
#include <vector>
#include <boost/interprocess/detail/managed_memory_impl.hpp>
Index: managed_mapped_file.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/managed_mapped_file.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- managed_mapped_file.hpp 12 Jun 2007 17:07:09 -0000 1.6
+++ managed_mapped_file.hpp 22 Jul 2007 14:04:19 -0000 1.7
@@ -19,7 +19,7 @@
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/interprocess/detail/managed_open_or_create_impl.hpp>
#include <boost/interprocess/detail/managed_memory_impl.hpp>
-#include <boost/interprocess/detail/creation_tags.hpp>
+#include <boost/interprocess/creation_tags.hpp>
#include <boost/interprocess/detail/file_wrapper.hpp>
#include <boost/interprocess/detail/move.hpp>
@@ -59,31 +59,31 @@
public: //functions
/*!Creates shared memory and creates and places the segment manager.
This can throw.*/
- basic_managed_mapped_file(detail::create_only_t create_only, const char
*name,
+ basic_managed_mapped_file(create_only_t create_only, const char *name,
std::size_t size, const void *addr = 0)
: m_mfile(create_only, name, size, read_write, addr,
- create_open_func_t(get_this_pointer(), DoCreate))
+ create_open_func_t(get_this_pointer(), detail::DoCreate))
{}
/*!Creates shared memory and creates and places the segment manager if
segment was not created. If segment was created it connects to the
segment.
This can throw.*/
- basic_managed_mapped_file (detail::open_or_create_t open_or_create,
+ basic_managed_mapped_file (open_or_create_t open_or_create,
const char *name, std::size_t size,
const void *addr = 0)
: m_mfile(open_or_create, name, size, read_write, addr,
create_open_func_t(get_this_pointer(),
- DoCreateOrOpen))
+ detail::DoCreateOrOpen))
{}
/*!Connects to a created shared memory and it's the segment manager.
Never throws.*/
- basic_managed_mapped_file (detail::open_only_t open_only, const char* name,
+ basic_managed_mapped_file (open_only_t open_only, const char* name,
const void *addr = 0)
: m_mfile(open_only, name, read_write, addr,
create_open_func_t(get_this_pointer(),
- DoOpen))
+ detail::DoOpen))
{}
/*!Moves the ownership of "moved"'s managed memory to *this. Does not
throw*/
Index: managed_shared_memory.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/managed_shared_memory.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- managed_shared_memory.hpp 12 Jun 2007 17:07:09 -0000 1.7
+++ managed_shared_memory.hpp 22 Jul 2007 14:04:20 -0000 1.8
@@ -21,7 +21,7 @@
#include <boost/interprocess/detail/managed_memory_impl.hpp>
#include <boost/interprocess/detail/managed_open_or_create_impl.hpp>
#include <boost/interprocess/shared_memory_object.hpp>
-#include <boost/interprocess/detail/creation_tags.hpp>
+#include <boost/interprocess/creation_tags.hpp>
/*!\file
Describes a named shared memory object allocation user class.
@@ -65,34 +65,34 @@
//!Creates shared memory and creates and places the segment manager.
//!This can throw.
- basic_managed_shared_memory(detail::create_only_t create_only, const char
*name,
+ basic_managed_shared_memory(create_only_t create_only, const char *name,
std::size_t size, const void *addr = 0)
: base_t()
, base2_t(create_only, name, size, read_write, addr,
- create_open_func_t(get_this_pointer(), DoCreate))
+ create_open_func_t(get_this_pointer(), detail::DoCreate))
{}
//!Creates shared memory and creates and places the segment manager if
//!segment was not created. If segment was created it connects to the
//!segment.
//!This can throw.
- basic_managed_shared_memory (detail::open_or_create_t open_or_create,
+ basic_managed_shared_memory (open_or_create_t open_or_create,
const char *name, std::size_t size,
const void *addr = 0)
: base_t()
, base2_t(open_or_create, name, size, read_write, addr,
create_open_func_t(get_this_pointer(),
- DoCreateOrOpen))
+ detail::DoCreateOrOpen))
{}
//!Connects to a created shared memory and it's the segment manager.
//!Never throws.
- basic_managed_shared_memory (detail::open_only_t open_only, const char*
name,
+ basic_managed_shared_memory (open_only_t open_only, const char* name,
const void *addr = 0)
: base_t()
, base2_t(open_only, name, read_write, addr,
create_open_func_t(get_this_pointer(),
- DoOpen))
+ detail::DoOpen))
{}
//!Moves the ownership of "moved"'s managed memory to *this. Does not throw
Index: managed_windows_shared_memory.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/managed_windows_shared_memory.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- managed_windows_shared_memory.hpp 12 Jun 2007 17:07:09 -0000 1.3
+++ managed_windows_shared_memory.hpp 22 Jul 2007 14:04:20 -0000 1.4
@@ -19,7 +19,7 @@
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/interprocess/detail/managed_open_or_create_impl.hpp>
#include <boost/interprocess/detail/managed_memory_impl.hpp>
-#include <boost/interprocess/detail/creation_tags.hpp>
+#include <boost/interprocess/creation_tags.hpp>
#include <boost/interprocess/windows_shared_memory.hpp>
#include <boost/interprocess/detail/move.hpp>
@@ -67,10 +67,10 @@
//!Creates shared memory and creates and places the segment manager.
//!This can throw.
basic_managed_windows_shared_memory
- (detail::create_only_t create_only, const char *name,
+ (create_only_t create_only, const char *name,
std::size_t size, const void *addr = 0)
: m_wshm(create_only, name, size, read_write, addr,
- create_open_func_t(get_this_pointer(), DoCreate))
+ create_open_func_t(get_this_pointer(), detail::DoCreate))
{}
//!Creates shared memory and creates and places the segment manager if
@@ -78,21 +78,21 @@
//!segment.
//!This can throw.
basic_managed_windows_shared_memory
- (detail::open_or_create_t open_or_create,
+ (open_or_create_t open_or_create,
const char *name, std::size_t size,
const void *addr = 0)
: m_wshm(open_or_create, name, size, read_write, addr,
create_open_func_t(get_this_pointer(),
- DoCreateOrOpen))
+ detail::DoCreateOrOpen))
{}
//!Connects to a created shared memory and it's the segment manager.
//!Never throws.
- basic_managed_windows_shared_memory (detail::open_only_t open_only, const
char* name,
+ basic_managed_windows_shared_memory (open_only_t open_only, const char*
name,
const void *addr = 0)
: m_wshm(open_only, name, read_write, addr,
create_open_func_t(get_this_pointer(),
- DoOpen))
+ detail::DoOpen))
{}
//!Moves the ownership of "moved"'s managed memory to *this. Does not throw
Index: mapped_region.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/mapped_region.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mapped_region.hpp 16 Jul 2007 18:44:55 -0000 1.7
+++ mapped_region.hpp 22 Jul 2007 14:04:20 -0000 1.8
@@ -325,7 +325,10 @@
}
//Update flush size if the user does not provide it
- if(numbytes == 0){
+ if(m_size == 0){
+ numbytes = 0;
+ }
+ else if(numbytes == 0){
numbytes = m_size - mapping_offset;
}
@@ -354,19 +357,16 @@
inline mapped_region::mapped_region()
: m_base(MAP_FAILED), m_size(0), m_offset(0), m_extra_offset(0)
- , m_file_mapping_hnd(detail::invalid_file())
{}
#ifndef BOOST_INTERPROCESS_RVALUE_REFERENCE
inline mapped_region::mapped_region(detail::moved_object<mapped_region> other)
: m_base(MAP_FAILED), m_size(0), m_offset(0), m_extra_offset(0)
- , m_file_mapping_hnd(detail::invalid_file())
{ this->swap(other.get()); }
#else
inline mapped_region::mapped_region(mapped_region &&other)
: m_base(MAP_FAILED), m_size(0), m_offset(0)
, m_extra_offset(0)
- , m_file_mapping_hnd(detail::invalid_file())
{ this->swap(other); }
#endif
@@ -382,7 +382,6 @@
std::size_t size,
const void *address)
: m_base(MAP_FAILED), m_size(0), m_offset(0), m_extra_offset(0)
- , m_file_mapping_hnd(invalid_file())
{
if(size == 0){
// offset_t filesize = lseek64
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
