Skip to content

Commit 1a86958

Browse files
committed
minimum boost to 1.60
1 parent 18da3bc commit 1a86958

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

configure.ac

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ fi
887887
if test x$use_boost = xyes; then
888888

889889
dnl Minimum required Boost version
890-
define(MINIMUM_REQUIRED_BOOST, 1.58.0)
890+
define(MINIMUM_REQUIRED_BOOST, 1.60.0)
891891

892892
dnl Check for Boost libs
893893
AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
@@ -957,11 +957,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
957957
#include <boost/thread/thread.hpp>
958958
#include <boost/version.hpp>
959959
]],[[
960-
#if BOOST_VERSION >= 105000 && (!defined(BOOST_HAS_NANOSLEEP) || BOOST_VERSION >= 105200)
961-
boost::this_thread::sleep_for(boost::chrono::milliseconds(0));
962-
#else
963-
choke me
964-
#endif
960+
boost::this_thread::sleep_for(boost::chrono::milliseconds(0));
965961
]])],
966962
[boost_sleep=yes;
967963
AC_DEFINE(HAVE_WORKING_BOOST_SLEEP_FOR, 1, [Define this symbol if boost sleep_for works])],

src/qt/qtipcserver.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
// Distributed under the MIT/X11 software license, see the accompanying
33
// file COPYING or https://opensource.org/licenses/mit-license.php.
44

5-
#if defined(WIN32) && BOOST_VERSION == 104900
6-
#define BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME
7-
#define BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME
8-
#endif
9-
105
#include "qtipcserver.h"
116
#include "guiconstants.h"
127
#include "ui_interface.h"
@@ -17,8 +12,8 @@
1712
#include <boost/interprocess/ipc/message_queue.hpp>
1813
#include <boost/version.hpp>
1914

20-
#if defined(WIN32) && (!defined(BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME) || !defined(BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME) || BOOST_VERSION < 104900)
21-
#warning Compiling without BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME and BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME uncommented in boost/interprocess/detail/tmp_dir_helpers.hpp or using a boost version before 1.49 may have unintended results see svn.boost.org/trac/boost/ticket/5392
15+
#if defined(WIN32) && (!defined(BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME) || !defined(BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME))
16+
#warning Compiling without BOOST_INTERPROCESS_HAS_WINDOWS_KERNEL_BOOTTIME and BOOST_INTERPROCESS_HAS_KERNEL_BOOTTIME uncommented in boost/interprocess/detail/tmp_dir_helpers.hpp may have unintended results see svn.boost.org/trac/boost/ticket/5392
2217
#endif
2318

2419
using namespace boost;

0 commit comments

Comments
 (0)