boost/interprocess
2
0
Fork 0
mirror of https://github.com/boostorg/interprocess.git synced 2026-01-19 04:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-04-16 12:21:17 +02:00
parent f7a0fe53d6 5f81d0dc14
commit 1e2345cdf1
7 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doc/interprocess.qbk
View File

@@ -6720,6 +6720,8 @@ thank them:
* [@https://svn.boost.org/trac/boost/ticket/9284 #9284 (['"WaitForSingleObject(mutex) must handle WAIT_ABANDONED"])].
* [@https://svn.boost.org/trac/boost/ticket/9285 #9285 (['"CreateMutex returns NULL if fails"])].
* [@https://svn.boost.org/trac/boost/ticket/9288 #9288 (['"timed_wait does not check if it has expired"])].
* [@https://svn.boost.org/trac/boost/ticket/9408 #9408: ['"Android does not support XSI_SHARED_MEMORY_OBJECTS"]].
* [@https://svn.boost.org/trac/boost/ticket/9835 #9835 (['"Boost Interprocess fails to compile with Android NDK GCC 4.8, -Werror=unused-variable"])].
* [*ABI breaking]: [@https://svn.boost.org/trac/boost/ticket/9221 #9221] showed
that `BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX` option of message queue,
@@ -6730,13 +6732,6 @@ thank them:
[endsect]
[section:release_notes_boost_1_56_00 Boost 1.56 Release]
* Fixed bugs:
* [@https://svn.boost.org/trac/boost/ticket/9408 #9408: ['"Android does not support XSI_SHARED_MEMORY_OBJECTS"]].
[endsect]
[section:release_notes_boost_1_55_00 Boost 1.55 Release]
* Fixed bugs [@https://svn.boost.org/trac/boost/ticket/7156 #7156],

2
example/Jamfile.v2
View File

@@ -25,7 +25,7 @@ rule test_all
: # additional args
<toolset>acc:<linkflags>-lrt
<toolset>acc-pa_risc:<linkflags>-lrt
<toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
<toolset>gcc,<target-os>windows:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
<host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
<host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
: # test-files

2
include/boost/interprocess/detail/win32_api.hpp
View File

@@ -34,7 +34,7 @@
# pragma comment( lib, "Shell32.lib" ) //SHGetSpecialFolderPathA
#endif
#if (defined BOOST_INTERPROCESS_WINDOWS)
#if defined (BOOST_INTERPROCESS_WINDOWS)
# include <cstdarg>
# include <boost/detail/interlocked.hpp>
#else

3
include/boost/interprocess/mapped_region.hpp
View File

@@ -741,6 +741,9 @@ inline bool mapped_region::advise(advice_types advice)
const unsigned int mode_none = 0;
const unsigned int mode_padv = 1;
const unsigned int mode_madv = 2;
// Suppress "unused variable" warnings
(void)mode_padv;
(void)mode_madv;
unsigned int mode = mode_none;
//Choose advice either from POSIX (preferred) or native Unix
switch(advice){

2
include/boost/interprocess/offset_ptr.hpp
View File

@@ -75,7 +75,7 @@ namespace ipcdetail {
//
////////////////////////////////////////////////////////////////////////
#define BOOST_INTERPROCESS_OFFSET_PTR_INLINE_TO_PTR
#if defined(_MSC_VER) && (_MSC_VER >= 1700) && (defined(_M_AMD64) || defined(_M_X64))
#if defined(_MSC_VER) && (_MSC_VER >= 1800) && (defined(_M_AMD64) || defined(_M_X64))
//Visual 2013 x64 optimizes more than we desire, so disable branchless option
#else
#define BOOST_INTERPROCESS_OFFSET_PTR_BRANCHLESS_TO_PTR

2
proj/vc7ide/iunordered_set_index_allocation_test.vcproj
View File

@@ -85,7 +85,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
AdditionalDependencies="winmm.lib psapi.lib"
OutputFile="$(OutDir)/iunordered_set_index_allocation_test.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="../../../../stage/lib"

2
test/Jamfile.v2
View File

@@ -27,7 +27,7 @@ rule test_all
: # requirements
<toolset>acc:<linkflags>-lrt
<toolset>acc-pa_risc:<linkflags>-lrt
<toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
<toolset>gcc,<target-os>windows:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
<host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
<host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
] ;