diff options
| author | Tim Landscheidt <tim@tim-landscheidt.de> | 2019-01-17 23:35:58 +0000 |
|---|---|---|
| committer | Tim Landscheidt <tim@tim-landscheidt.de> | 2019-01-17 23:43:19 +0000 |
| commit | d0269e8c94dca6accba1d60e24ffb7f4b2f35932 (patch) | |
| tree | b73d0162dda08d83565007108d9f53c00e991e6e /src/pyinterp.cc | |
| parent | 2a8f433c6b8b2a9f2c182de17315bf5eceb2dced (diff) | |
| download | fork-ledger-d0269e8c94dca6accba1d60e24ffb7f4b2f35932.tar.gz fork-ledger-d0269e8c94dca6accba1d60e24ffb7f4b2f35932.tar.bz2 fork-ledger-d0269e8c94dca6accba1d60e24ffb7f4b2f35932.zip | |
Drop conditionals for Boost earlier than 1.49
Ledger requires Boost 1.49 or later and enforces this in
CMakeLists.txt. This means BOOST_VERSION will always be
104900 or higher. Also, since Boost 1.46,
BOOST_FILESYSTEM_VERSION is 3.
Diffstat (limited to 'src/pyinterp.cc')
| -rw-r--r-- | src/pyinterp.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/pyinterp.cc b/src/pyinterp.cc index 19430bef..fad0b559 100644 --- a/src/pyinterp.cc +++ b/src/pyinterp.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2018, John Wiegley. All rights reserved. + * Copyright (c) 2003-2019, John Wiegley. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -222,27 +222,13 @@ object python_interpreter_t::import_option(const string& str) python::list paths(sys_dict["path"]); if (contains(str, ".py")) { -#if BOOST_VERSION >= 103700 path& cwd(parsing_context.get_current().current_directory); -#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3 path parent(filesystem::absolute(file, cwd).parent_path()); -#else - path parent(filesystem::complete(file, cwd).parent_path()); -#endif DEBUG("python.interp", "Adding " << parent << " to PYTHONPATH"); paths.insert(0, parent.string()); sys_dict["path"] = paths; -#if BOOST_VERSION >= 104600 name = file.stem().string(); -#else - name = file.stem(); -#endif -#else // BOOST_VERSION >= 103700 - paths.insert(0, file.branch_path().string()); - sys_dict["path"] = paths; - name = file.leaf(); -#endif // BOOST_VERSION >= 103700 } try { |