From e493a3859c7c854b79e772ffb1c0a69f6868ac98 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 1 Mar 2012 15:09:39 -0600 Subject: Use filesystem::complete not absolute with Boost < 1.46 --- src/context.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/context.h') diff --git a/src/context.h b/src/context.h index 0533536f..d7999e5a 100644 --- a/src/context.h +++ b/src/context.h @@ -110,7 +110,11 @@ inline parse_context_t open_for_reading(const path& pathname, throw_(std::runtime_error, _("Cannot read journal file %1") << filename); +#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3 path parent(filesystem::absolute(pathname, cwd).parent_path()); +#else + path parent(filesystem::complete(pathname, cwd).parent_path()); +#endif shared_ptr stream(new ifstream(filename)); parse_context_t context(stream, parent); context.pathname = filename; -- cgit v1.2.3