From d1bc057a220f33a79501318477f8e9af1111229f Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 23 Mar 2023 14:12:57 +0100 Subject: Bump required Boost version to 1.72 --- src/ptree.cc | 5 ----- src/system.hh.in | 12 ------------ src/utils.cc | 4 ---- src/utils.h | 4 ---- 4 files changed, 25 deletions(-) (limited to 'src') diff --git a/src/ptree.cc b/src/ptree.cc index a37d0be5..01bf16b0 100644 --- a/src/ptree.cc +++ b/src/ptree.cc @@ -80,12 +80,7 @@ void format_ptree::flush() switch (format) { case FORMAT_XML: -#if BOOST_VERSION >= 105600 auto indented = property_tree::xml_writer_make_settings (' ', 2); -#else - property_tree::xml_writer_settings indented(' ', 2); -#endif - property_tree::write_xml(out, pt, indented); out << std::endl; break; diff --git a/src/system.hh.in b/src/system.hh.in index 60ea0fd8..a6c465df 100644 --- a/src/system.hh.in +++ b/src/system.hh.in @@ -70,7 +70,6 @@ #define HAVE_BOOST_PYTHON @HAVE_BOOST_PYTHON@ #define HAVE_GPGME @HAVE_GPGME@ #define HAVE_BOOST_REGEX_UNICODE @HAVE_BOOST_REGEX_UNICODE@ -#define HAVE_BOOST_159_ISSUE_39 @HAVE_BOOST_159_ISSUE_39@ #define HAVE_BOOST_NOWIDE @HAVE_BOOST_NOWIDE@ #define DEBUG_MODE @DEBUG_MODE@ @@ -216,17 +215,6 @@ #include -#if BOOST_VERSION == 105900 && HAVE_BOOST_159_ISSUE_39 -// Fix for https://github.com/boostorg/python/issues/39 -namespace boost { namespace python { -template -inline object make_setter(D const& x) -{ - return detail::make_setter(x, default_call_policies(), is_member_pointer(), 0); -} -}} -#endif - #endif // HAVE_BOOST_PYTHON #endif // INCLUDED_SYSTEM_HH diff --git a/src/utils.cc b/src/utils.cc index 1d457891..baf5a27a 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -849,11 +849,7 @@ path resolve_path(const path& pathname) path temp = pathname; if (temp.string()[0] == '~') temp = expand_path(temp); -#if (BOOST_VERSION >= 106000) temp.lexically_normal(); -#else - temp.normalize(); -#endif return temp; } diff --git a/src/utils.h b/src/utils.h index b09377b8..9cc51396 100644 --- a/src/utils.h +++ b/src/utils.h @@ -44,11 +44,7 @@ #ifndef INCLUDED_UTILS_H #define INCLUDED_UTILS_H -#if (BOOST_VERSION >= 106600) #include -#else -#include -#endif /** * @name Default values -- cgit v1.2.3