Skip to content

Commit

Permalink
build: boost: Drop branches requiring boost-1.46
Browse files Browse the repository at this point in the history
  • Loading branch information
plaes authored and wwmayer committed Oct 13, 2020
1 parent 95ed017 commit 6a6a6f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/App/Application.cpp
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/App/PropertyStandard.cpp
Expand Up @@ -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 );
Expand All @@ -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();
Expand Down

0 comments on commit 6a6a6f3

Please sign in to comment.