Update of /cvsroot/boost/boost/boost/interprocess/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29345/detail
Modified Files:
basic_segment_manager.hpp config_begin.hpp config_end.hpp
Log Message:
no message
Index: basic_segment_manager.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/interprocess/detail/basic_segment_manager.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basic_segment_manager.hpp 12 Jun 2007 17:07:07 -0000 1.1
+++ basic_segment_manager.hpp 23 Jun 2007 12:51:56 -0000 1.2
@@ -19,7 +19,7 @@
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/detail/no_exceptions_support.hpp>
-#include <boost/type_traits/alignment_of.hpp>
+#include <boost/interprocess/detail/type_traits.hpp>
#include <boost/interprocess/detail/utilities.hpp>
#include <boost/interprocess/detail/in_place_interface.hpp>
#include <boost/interprocess/exceptions.hpp>
@@ -105,7 +105,7 @@
{
return get_rounded_size
( sizeof(Header)
- , boost::alignment_of<block_header>::value)
+ , detail::alignment_of<block_header>::value)
+ total_size();
}
@@ -159,7 +159,7 @@
template<class T>
static block_header *block_header_from_value(T *value)
- { return block_header_from_value(value, sizeof(T),
boost::alignment_of<T>::value); }
+ { return block_header_from_value(value, sizeof(T),
detail::alignment_of<T>::value); }
static block_header *block_header_from_value(const void *value, std::size_t
sz, std::size_t algn)
{
@@ -178,7 +178,7 @@
{
block_header * hdr =
reinterpret_cast<block_header*>(detail::char_ptr_cast(header) +
- get_rounded_size(sizeof(Header),
boost::alignment_of<block_header>::value));
+ get_rounded_size(sizeof(Header),
detail::alignment_of<block_header>::value));
//Some sanity checks
return hdr;
}
@@ -188,7 +188,7 @@
{
Header * hdr =
reinterpret_cast<Header*>(detail::char_ptr_cast(bheader) -
- get_rounded_size(sizeof(Header),
boost::alignment_of<block_header>::value));
+ get_rounded_size(sizeof(Header),
detail::alignment_of<block_header>::value));
//Some sanity checks
return hdr;
}
Index: config_begin.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/detail/config_begin.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config_begin.hpp 12 Jun 2007 17:07:07 -0000 1.5
+++ config_begin.hpp 23 Jun 2007 12:51:56 -0000 1.6
@@ -1,11 +1,13 @@
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
+#ifndef BOOST_INTERPROCESS_CONFIG_INCLUDED
+#define BOOST_INTERPROCESS_CONFIG_INCLUDED
#include <boost/config.hpp>
-#include <boost/detail/workaround.hpp>
+#endif
-#ifdef _MSC_VER
+#ifdef BOOST_MSVC
+ #ifdef _CRT_SECURE_NO_DEPRECATE
+ #define BOOST_INTERPROCESS_CRT_SECURE_NO_DEPRECATE
+ #define _CRT_SECURE_NO_DEPRECATE
+ #endif
#pragma warning (push)
//
//'function' : resolved overload was found by argument-dependent lookup
@@ -30,5 +32,6 @@
#pragma warning (disable : 4521) ////Disable "multiple copy constructors
specified"
#pragma warning (disable : 4522)
#pragma warning (disable : 4146)
+ #pragma warning (disable : 4503) //Decorated name length exceeded
#pragma warning (disable : 4267) //conversion from 'X' to 'Y', possible
loss of data
#endif
Index: config_end.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/interprocess/detail/config_end.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config_end.hpp 12 Jun 2007 17:07:07 -0000 1.3
+++ config_end.hpp 23 Jun 2007 12:51:56 -0000 1.4
@@ -1,3 +1,8 @@
-#if defined _MSC_VER
+#if defined BOOST_MSVC
#pragma warning (pop)
+ #ifdef BOOST_INTERPROCESS_CRT_SECURE_NO_DEPRECATE
+ #undef BOOST_INTERPROCESS_CRT_SECURE_NO_DEPRECATE
+ #undef _CRT_SECURE_NO_DEPRECATE
+ #endif
#endif
+
-------------------------------------------------------------------------
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
