diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-02-09 00:00:57 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-02-09 00:00:57 -0400 |
| commit | f8a623d54777d675579e485a24f10bf24cc59cc3 (patch) | |
| tree | 089a02796b48c265bc0eea33c37a70665556d712 | |
| parent | 0cb8049c41b68ab999fbd2c4173c680fb1b545df (diff) | |
| download | fork-ledger-f8a623d54777d675579e485a24f10bf24cc59cc3.tar.gz fork-ledger-f8a623d54777d675579e485a24f10bf24cc59cc3.tar.bz2 fork-ledger-f8a623d54777d675579e485a24f10bf24cc59cc3.zip | |
Conditionalized some boost::filesystem calls that were too new.
| -rw-r--r-- | python/pyinterp.h | 8 | ||||
| -rw-r--r-- | src/stream.cc | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/python/pyinterp.h b/python/pyinterp.h index 9e1a86a9..4863cbb9 100644 --- a/python/pyinterp.h +++ b/python/pyinterp.h @@ -109,10 +109,18 @@ public: python::object sys_dict = module_sys.attr("__dict__"); python::list paths(sys_dict["path"]); +#if BOOST_VERSION >= 103700 paths.insert(0, file.parent_path().string()); +#else + paths.insert(0, file.branch_path().string()); +#endif sys_dict["path"] = paths; +#if BOOST_VERSION >= 103700 import(file.stem()); +#else + import(file.string()); +#endif return true; } }; diff --git a/src/stream.cc b/src/stream.cc index a9ecfe6a..cf85f2d4 100644 --- a/src/stream.cc +++ b/src/stream.cc @@ -87,7 +87,11 @@ namespace { // Find command name: its the substring starting right of the // rightmost '/' character in the pager pathname. See manpage for // strrchr. +#if BOOST_VERSION >= 103700 path basename(pager_path.filename()); +#else + path basename(pager_path.leaf()); +#endif execlp(pager_path.string().c_str(), basename.string().c_str(), (char *)0); |