Revert "Disable BOOST_INTERPROCESS_POSIX_FALLOCATE feature"

This reverts commit 1947997a8c9968671bef68e21287ccbb0ab3833f.

Change-Id: I1d34a5e9295f77866454c9b6d38b5e130bfed3df

diff --git a/packaging/boost.spec b/packaging/boost.spec
index 98adbb8..3f50b1e 100644 (file)
--- a/packaging/boost.spec
+++ b/packaging/boost.spec
@@ -75,7 +75,6 @@ Source1001:     boost.manifest
 Source1002:     boost.pc
 Source1003:     run_test.sh
 Source1004:     asio_scheduler.patch
-Source1005:     disable_BOOST_INTERPROCESS_POSIX_FALLOCATE.patch    
 
 %define _docdir %{_datadir}/doc/packages/boost-%{version}
 
@@ -412,7 +411,6 @@ Restults of Boost test suite execution
 cp %{SOURCE1001} .
 cp %{SOURCE1002} .
 %{__patch} -p1 < %{SOURCE1004}
-%{__patch} -p1 < %{SOURCE1005}
 #everything in the tarball has the executable flag set ...
 find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} +
 

diff --git a/packaging/disable_BOOST_INTERPROCESS_POSIX_FALLOCATE.patch b/packaging/disable_BOOST_INTERPROCESS_POSIX_FALLOCATE.patch
deleted file mode 100644 (file)
index 981a969..0000000
--- a/packaging/disable_BOOST_INTERPROCESS_POSIX_FALLOCATE.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/boost/interprocess/detail/workaround.hpp b/boost/interprocess/detail/workaround.hpp
-index bbab82eb15..4f16bcecae 100644
---- a/boost/interprocess/detail/workaround.hpp
-+++ b/boost/interprocess/detail/workaround.hpp
-@@ -156,13 +156,6 @@
-       #define BOOST_INTERPROCESS_UNIX_64_BIT_OR_BIGGER_OFF_T
-    #endif
- 
--   //////////////////////////////////////////////////////
--   //posix_fallocate
--   //////////////////////////////////////////////////////
--   #if (_XOPEN_SOURCE >= 600 || __POSIX_C_SOURCE >= 200112L)
--   #define BOOST_INTERPROCESS_POSIX_FALLOCATE
--   #endif
--
- #endif   //!defined(BOOST_INTERPROCESS_WINDOWS)
- 
- #if defined(BOOST_INTERPROCESS_WINDOWS) || defined(BOOST_INTERPROCESS_POSIX_MAPPED_FILES)
-diff --git a/boost/interprocess/shared_memory_object.hpp b/boost/interprocess/shared_memory_object.hpp
-index 9981efc14a..d835a8fb05 100644
---- a/boost/interprocess/shared_memory_object.hpp
-+++ b/boost/interprocess/shared_memory_object.hpp
-@@ -35,7 +35,7 @@
- 
- #if defined(BOOST_INTERPROCESS_POSIX_SHARED_MEMORY_OBJECTS)
- #  include <string>
--#  include <fcntl.h>        //posix_fallocate, O_CREAT, O_*...
-+#  include <fcntl.h>        //O_CREAT, O_*...
- #  include <sys/mman.h>     //shm_xxx
- #  include <unistd.h>       //ftruncate, close
- #  include <sys/stat.h>     //mode_t, S_IRWXG, S_IRWXO, S_IRWXU,
-@@ -456,15 +456,6 @@ inline bool shared_memory_object::remove(const char *filename)
- 
- inline void shared_memory_object::truncate(offset_t length)
- {
--   #ifdef BOOST_INTERPROCESS_POSIX_FALLOCATE
--   int ret = posix_fallocate(m_handle, 0, length);
--
--   if (ret && ret != EOPNOTSUPP){
--      error_info err(system_error_code());
--      throw interprocess_exception(err);
--   }
--   //ftruncate fallback
--   #endif //BOOST_INTERPROCESS_POSIX_FALLOCATE
-    if(0 != ftruncate(m_handle, length)){
-       error_info err(system_error_code());
-       throw interprocess_exception(err);
-diff --git a/libs/interprocess/doc/interprocess.qbk b/libs/interprocess/doc/interprocess.qbk
-index d845059e96..32b5d57c0c 100644
---- a/libs/interprocess/doc/interprocess.qbk
-+++ b/libs/interprocess/doc/interprocess.qbk
-@@ -6830,7 +6830,6 @@ thank them:
-    * [@https://github.com/boostorg/interprocess/issues/76  GitHub #76  (['"Cygwin compilation errors"])].
-    * [@https://github.com/boostorg/interprocess/pull/83    GitHub #83  (['"Add BOOST_INTERPROCESS_FORCE_NATIVE_EMULATION option"])].
-    * [@https://github.com/boostorg/interprocess/pull/92    GitHub #92  (['"bufferstream: Correct MSVC compilation warning"])].
--   * [@https://github.com/boostorg/interprocess/pull/106   GitHub #106 (['"Use fallocate on truncate_file"])].
-    * [@https://github.com/boostorg/interprocess/issues/120 GitHub #120 (['"segment_manager customization"])].
-    * [@https://github.com/boostorg/interprocess/issues/122 GitHub #122 (['"Mark constructors/assignment/swap noexcept where possible"])].
-    * [@https://github.com/boostorg/interprocess/issues/126 GitHub #126 (['"_ReadWriteBarrier is deprecated warning when compiling with clang-cl.exe"])].