diff DEPENDENCIES/generic/include/boost/interprocess/detail/workaround.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/interprocess/detail/workaround.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/interprocess/detail/workaround.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -11,6 +11,14 @@
 #ifndef BOOST_INTERPROCESS_DETAIL_WORKAROUND_HPP
 #define BOOST_INTERPROCESS_DETAIL_WORKAROUND_HPP
 
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+#
+#if defined(BOOST_HAS_PRAGMA_ONCE)
+#  pragma once
+#endif
+
 #include <boost/interprocess/detail/config_begin.hpp>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
@@ -22,7 +30,24 @@
 #else
    #include <unistd.h>
 
-   #if defined(_POSIX_THREAD_PROCESS_SHARED) && ((_POSIX_THREAD_PROCESS_SHARED - 0) > 0)
+   //////////////////////////////////////////////////////
+   //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
+   //////////////////////////////////////////////////////
+   #if !defined(__QNXNTO__) && !defined(__ANDROID__) && !defined(__HAIKU__)
+      #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
+   #endif
+
+   //////////////////////////////////////////////////////
+   // From SUSv3/UNIX 98, pthread_mutexattr_settype is mandatory
+   //////////////////////////////////////////////////////
+   #if defined(_XOPEN_UNIX) && ((_XOPEN_VERSION + 0) >= 500)
+      #define BOOST_INTERPROCESS_POSIX_RECURSIVE_MUTEXES
+   #endif
+
+   //////////////////////////////////////////////////////
+   // _POSIX_THREAD_PROCESS_SHARED (POSIX.1b/POSIX.4)
+   //////////////////////////////////////////////////////
+   #if defined(_POSIX_THREAD_PROCESS_SHARED) && ((_POSIX_THREAD_PROCESS_SHARED + 0) > 0)
       //Cygwin defines _POSIX_THREAD_PROCESS_SHARED but does not implement it.
       #if defined(__CYGWIN__)
          #define BOOST_INTERPROCESS_BUGGY_POSIX_PROCESS_SHARED
@@ -47,62 +72,12 @@
       #endif
    #endif
 
-   #if defined(_POSIX_BARRIERS) && ((_POSIX_BARRIERS - 0) > 0)
-      #define BOOST_INTERPROCESS_POSIX_BARRIERS
-   #endif
-
-   #if defined(_POSIX_SEMAPHORES) && ((_POSIX_SEMAPHORES - 0) > 0)
-      #define BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
-      #if defined(__CYGWIN__)
-         #define BOOST_INTERPROCESS_POSIX_SEMAPHORES_NO_UNLINK
-      #endif
-   //Some platforms have a limited (name length) named semaphore support
-   #elif (defined(__FreeBSD__) && (__FreeBSD__ >= 4)) || defined(__APPLE__)
-      #define BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
-   #endif
-
-   #if ((defined _V6_ILP32_OFFBIG)  &&(_V6_ILP32_OFFBIG   - 0 > 0)) ||\
-       ((defined _V6_LP64_OFF64)    &&(_V6_LP64_OFF64     - 0 > 0)) ||\
-       ((defined _V6_LPBIG_OFFBIG)  &&(_V6_LPBIG_OFFBIG   - 0 > 0)) ||\
-       ((defined _XBS5_ILP32_OFFBIG)&&(_XBS5_ILP32_OFFBIG - 0 > 0)) ||\
-       ((defined _XBS5_LP64_OFF64)  &&(_XBS5_LP64_OFF64   - 0 > 0)) ||\
-       ((defined _XBS5_LPBIG_OFFBIG)&&(_XBS5_LPBIG_OFFBIG - 0 > 0)) ||\
-       ((defined _FILE_OFFSET_BITS) &&(_FILE_OFFSET_BITS  - 0 >= 64))||\
-       ((defined _FILE_OFFSET_BITS) &&(_FILE_OFFSET_BITS  - 0 >= 64))
-      #define BOOST_INTERPROCESS_UNIX_64_BIT_OR_BIGGER_OFF_T
-   #endif
-
-   //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
-   #if !defined(__QNXNTO__)
-      #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
-   #endif
-
-   #if defined(_POSIX_SHARED_MEMORY_OBJECTS) && ((_POSIX_SHARED_MEMORY_OBJECTS - 0) > 0)
+   //////////////////////////////////////////////////////
+   // _POSIX_SHARED_MEMORY_OBJECTS (POSIX.1b/POSIX.4)
+   //////////////////////////////////////////////////////
+   #if ( defined(_POSIX_SHARED_MEMORY_OBJECTS) && ((_POSIX_SHARED_MEMORY_OBJECTS + 0) > 0) ) ||\
+         (defined(__vms) && __CRTL_VER >= 70200000)
       #define BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
-   #else
-      //VMS and MACOS don't define it but they have shm_open/close interface
-      #if defined(__vms)
-         #if __CRTL_VER >= 70200000
-            #define BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
-         #endif
-         //Mac OS has some non-conformant features like names limited to SHM_NAME_MAX
-      #elif defined (__APPLE__)
-         //#define BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
-         //#define BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS_NO_GROW
-      #endif
-   #endif
-
-   //Now check if we have only XSI shared memory
-   #if defined(BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS) &&\
-      !defined(BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS)
-      //#define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS_ONLY
-   #endif
-
-   #if defined(_POSIX_TIMEOUTS) && ((_POSIX_TIMEOUTS - 0) > 0)
-      #define BOOST_INTERPROCESS_POSIX_TIMEOUTS
-   #endif
-
-   #ifdef BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS
       //Some systems have filesystem-based resources, so the
       //portable "/shmname" format does not work due to permission issues
       //For those systems we need to form a path to a temporary directory:
@@ -110,23 +85,52 @@
       #if defined(__hpux) || defined(__osf__) || defined(__vms) || (defined(__FreeBSD__) && (__FreeBSD__ < 7))
          #define BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SHARED_MEMORY
       //Some systems have "jailed" environments where shm usage is restricted at runtime
-      //and temporary file file based shm is possible in those executions.
+      //and temporary file based shm is possible in those executions.
       #elif defined(__FreeBSD__)
          #define BOOST_INTERPROCESS_RUNTIME_FILESYSTEM_BASED_POSIX_SHARED_MEMORY
       #endif
    #endif
 
-   #ifdef BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
+   //////////////////////////////////////////////////////
+   // _POSIX_MAPPED_FILES (POSIX.1b/POSIX.4)
+   //////////////////////////////////////////////////////
+   #if defined(_POSIX_MAPPED_FILES) && ((_POSIX_MAPPED_FILES + 0) > 0)
+      #define BOOST_INTERPROCESS_POSIX_MAPPED_FILES
+   #endif
+
+   //////////////////////////////////////////////////////
+   // _POSIX_SEMAPHORES (POSIX.1b/POSIX.4)
+   //////////////////////////////////////////////////////
+   #if ( defined(_POSIX_SEMAPHORES) && ((_POSIX_SEMAPHORES + 0) > 0) ) ||\
+       ( defined(__FreeBSD__) && (__FreeBSD__ >= 4)) || \
+         defined(__APPLE__)
+      #define BOOST_INTERPROCESS_POSIX_NAMED_SEMAPHORES
+      //MacOsX declares _POSIX_SEMAPHORES but sem_init returns ENOSYS
+      #if !defined(__APPLE__)
+         #define BOOST_INTERPROCESS_POSIX_UNNAMED_SEMAPHORES
+      #endif
       #if defined(__osf__) || defined(__vms)
          #define BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SEMAPHORES
       #endif
    #endif
 
-   #if defined(_POSIX_VERSION) && defined(_XOPEN_VERSION) && \
-       (((_POSIX_VERSION + 0)>= 200112L || (_XOPEN_VERSION + 0)>= 500))
-      #define BOOST_INTERPROCESS_POSIX_RECURSIVE_MUTEXES
+   //////////////////////////////////////////////////////
+   // _POSIX_BARRIERS (SUSv3/Unix03)
+   //////////////////////////////////////////////////////
+   #if defined(_POSIX_BARRIERS) && ((_POSIX_BARRIERS + 0) >= 200112L)
+      #define BOOST_INTERPROCESS_POSIX_BARRIERS
    #endif
 
+   //////////////////////////////////////////////////////
+   // _POSIX_TIMEOUTS (SUSv3/Unix03)
+   //////////////////////////////////////////////////////
+   #if defined(_POSIX_TIMEOUTS) && ((_POSIX_TIMEOUTS + 0L) >= 200112L)
+      #define BOOST_INTERPROCESS_POSIX_TIMEOUTS
+   #endif
+
+   //////////////////////////////////////////////////////
+   // Detect BSD derivatives to detect sysctl
+   //////////////////////////////////////////////////////
    #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
       #define BOOST_INTERPROCESS_BSD_DERIVATIVE
       //Some *BSD systems (OpenBSD & NetBSD) need sys/param.h before sys/sysctl.h, whereas
@@ -138,10 +142,24 @@
          //#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
       #endif
    #endif
+
+   //////////////////////////////////////////////////////
+   //64 bit offset
+   //////////////////////////////////////////////////////
+   #if (defined (_V6_ILP32_OFFBIG)  &&(_V6_ILP32_OFFBIG   - 0 > 0)) ||\
+       (defined (_V6_LP64_OFF64)    &&(_V6_LP64_OFF64     - 0 > 0)) ||\
+       (defined (_V6_LPBIG_OFFBIG)  &&(_V6_LPBIG_OFFBIG   - 0 > 0)) ||\
+       (defined (_XBS5_ILP32_OFFBIG)&&(_XBS5_ILP32_OFFBIG - 0 > 0)) ||\
+       (defined (_XBS5_LP64_OFF64)  &&(_XBS5_LP64_OFF64   - 0 > 0)) ||\
+       (defined (_XBS5_LPBIG_OFFBIG)&&(_XBS5_LPBIG_OFFBIG - 0 > 0)) ||\
+       (defined (_FILE_OFFSET_BITS) &&(_FILE_OFFSET_BITS  - 0 >= 64))||\
+       (defined (_FILE_OFFSET_BITS) &&(_FILE_OFFSET_BITS  - 0 >= 64))
+      #define BOOST_INTERPROCESS_UNIX_64_BIT_OR_BIGGER_OFF_T
+   #endif
 #endif   //!defined(BOOST_INTERPROCESS_WINDOWS)
 
-#if    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-   #define BOOST_INTERPROCESS_PERFECT_FORWARDING
+#if defined(BOOST_INTERPROCESS_WINDOWS) || defined(BOOST_INTERPROCESS_POSIX_MAPPED_FILES)
+#  define BOOST_INTERPROCESS_MAPPED_FILES
 #endif
 
 //Now declare some Boost.Interprocess features depending on the implementation
@@ -150,6 +168,10 @@
    #define BOOST_INTERPROCESS_NAMED_SEMAPHORE_USES_POSIX_SEMAPHORES
 #endif
 
+#if    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+   #define BOOST_INTERPROCESS_PERFECT_FORWARDING
+#endif
+
 // Timeout duration use if BOOST_INTERPROCESS_ENABLE_TIMEOUT_WHEN_LOCKING is set
 #ifndef BOOST_INTERPROCESS_TIMEOUT_WHEN_LOCKING_DURATION_MS
    #define BOOST_INTERPROCESS_TIMEOUT_WHEN_LOCKING_DURATION_MS 10000
@@ -162,32 +184,9 @@
 //with processes compiled with those versions.
 #define BOOST_INTERPROCESS_MSG_QUEUE_CIRCULAR_INDEX
 
-//Inline attributes
-#if defined(_MSC_VER)
-   #define BOOST_INTERPROCESS_ALWAYS_INLINE __forceinline
-#elif defined (__GNUC__)
-   #define BOOST_INTERPROCESS_ALWAYS_INLINE __attribute__((__always_inline__))
-#else
-   #define BOOST_INTERPROCESS_ALWAYS_INLINE inline
-#endif
-
-#if defined(_MSC_VER)
-   #define BOOST_INTERPROCESS_NEVER_INLINE __declspec(noinline)
-#elif defined (__GNUC__)
-   #define BOOST_INTERPROCESS_NEVER_INLINE __attribute__((__noinline__))
-#endif
-
-#if defined(BOOST_NO_CXX11_NOEXCEPT)
-   #if defined(BOOST_MSVC)
-      #define BOOST_INTERPROCESS_NOEXCEPT throw()
-   #else
-      #define BOOST_INTERPROCESS_NOEXCEPT
-   #endif
-   #define BOOST_INTERPROCESS_NOEXCEPT_IF(x)
-#else
-   #define BOOST_INTERPROCESS_NOEXCEPT    noexcept
-   #define BOOST_INTERPROCESS_NOEXCEPT_IF(x) noexcept(x)
-#endif
+//Macros for documentation purposes. For code, expands to the argument
+#define BOOST_INTERPROCESS_IMPDEF(TYPE) TYPE
+#define BOOST_INTERPROCESS_SEEDOC(TYPE) TYPE
 
 #include <boost/interprocess/detail/config_end.hpp>