diff --git a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp index fbc760fddad..5eebfb18155 100644 --- a/intern/cycles/util/util_cache.cpp +++ b/intern/cycles/util/util_cache.cpp @@ -24,12 +24,6 @@ #include "util_path.h" #include "util_types.h" -#include - -#if (BOOST_VERSION < 104400) -# define BOOST_FILESYSTEM_VERSION 2 -#endif - #include #include 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 -#include - -#if (BOOST_VERSION < 104400) -# define BOOST_FILESYSTEM_VERSION 2 -#endif - #include #include @@ -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& 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())