From 6a6a6f3d25294898155d8535e669f1069935fda3 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Wed, 7 Oct 2020 23:42:34 +0300 Subject: [PATCH] build: boost: Drop branches requiring boost-1.46 --- src/App/Application.cpp | 2 +- src/App/PropertyStandard.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App/Application.cpp b/src/App/Application.cpp index e536c6efff08..5c7fb90814ab 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1713,7 +1713,7 @@ void Application::init(int argc, char ** argv) #endif initTypes(); -#if (BOOST_VERSION < 104600) || (BOOST_FILESYSTEM_VERSION == 2) +#if (BOOST_FILESYSTEM_VERSION == 2) boost::filesystem::path::default_name_check(boost::filesystem::no_check); #endif diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index a3a0a8eb4f8d..8692fbb4cb55 100644 --- a/src/App/PropertyStandard.cpp +++ b/src/App/PropertyStandard.cpp @@ -203,7 +203,7 @@ void PropertyPath::setValue(const boost::filesystem::path &Path) void PropertyPath::setValue(const char * Path) { aboutToSetValue(); -#if (BOOST_VERSION < 104600) || (BOOST_FILESYSTEM_VERSION == 2) +#if (BOOST_FILESYSTEM_VERSION == 2) _cValue = boost::filesystem::path(Path,boost::filesystem::no_check ); //_cValue = boost::filesystem::path(Path,boost::filesystem::native ); //_cValue = boost::filesystem::path(Path,boost::filesystem::windows_name ); @@ -220,7 +220,7 @@ boost::filesystem::path PropertyPath::getValue(void) const PyObject *PropertyPath::getPyObject(void) { -#if (BOOST_VERSION < 104600) || (BOOST_FILESYSTEM_VERSION == 2) +#if (BOOST_FILESYSTEM_VERSION == 2) std::string str = _cValue.native_file_string(); #else std::string str = _cValue.string();