diff options
author | Thomas Dinges <blender@dingto.org> | 2015-02-18 15:48:16 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2015-02-18 15:49:49 +0300 |
commit | bf0a001e615c85cb998b68888f75e0e51188e650 (patch) | |
tree | cc9be0f48cd40b4a7c9c384a2c0a81262632c152 /intern/cycles/util/util_path.cpp | |
parent | 55fd389a70b357fa46fd7fcba6f74d8830dd2051 (diff) |
Cleanup: Remove support for Boost filesystem 2.
This is deprecated since Boost 1.48.
Diffstat (limited to 'intern/cycles/util/util_path.cpp')
-rw-r--r-- | intern/cycles/util/util_path.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index a3dbad08e32..e8f1ec81763 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -25,12 +25,6 @@ OIIO_NAMESPACE_USING #include <stdio.h> -#include <boost/version.hpp> - -#if (BOOST_VERSION < 104400) -# define BOOST_FILESYSTEM_VERSION 2 -#endif - #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> @@ -101,11 +95,7 @@ string path_user_get(const string& sub) string path_filename(const string& path) { -#if (BOOST_FILESYSTEM_VERSION == 2) - return to_boost(path).filename(); -#else return from_boost(to_boost(path).filename()); -#endif } string path_dirname(const string& path) @@ -284,11 +274,7 @@ void path_cache_clear_except(const string& name, const set<string>& except) boost::filesystem::directory_iterator it(dir), it_end; for(; it != it_end; it++) { -#if (BOOST_FILESYSTEM_VERSION == 2) - string filename = from_boost(it->path().filename()); -#else string filename = from_boost(it->path().filename().string()); -#endif if(boost::starts_with(filename, name)) if(except.find(filename) == except.end()) |