From d0269e8c94dca6accba1d60e24ffb7f4b2f35932 Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Thu, 17 Jan 2019 23:35:58 +0000 Subject: 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. --- src/context.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/context.h') diff --git a/src/context.h b/src/context.h index 0af59930..d69df73f 100644 --- a/src/context.h +++ b/src/context.h @@ -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 @@ -113,11 +113,7 @@ inline parse_context_t open_for_reading(const path& pathname, const path& cwd) { path filename = resolve_path(pathname); -#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3 filename = filesystem::absolute(filename, cwd); -#else - filename = filesystem::complete(filename, cwd); -#endif if (! exists(filename) || is_directory(filename)) throw_(std::runtime_error, _f("Cannot read journal file %1%") % filename); -- cgit v1.2.3