diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-11 18:48:47 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-07-11 18:48:47 +0400 |
| commit | a87051bd8ee06166ba3878a92ba63ec4d1f1ff27 (patch) | |
| tree | aa665b7528ff13e81c8f927804d2a886a8335a6d /intern/cycles/util/util_cache.cpp | |
| parent | 81829f5221f24e72658fe89f52cbee73c37fe6f3 (diff) | |
Patch #32074: Fix compilation with boost 1.50
This patch switches from boost's filesystem v2 to v3.
This should be completely smooth due to filesystem v3 is pretty
old already.
Patch by Sven-Hendrik Haase (aka svenstaro), thanks!
Diffstat (limited to 'intern/cycles/util/util_cache.cpp')
| -rw-r--r-- | intern/cycles/util/util_cache.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp index 44d784ba741..2924ed30b88 100644 --- a/intern/cycles/util/util_cache.cpp +++ b/intern/cycles/util/util_cache.cpp @@ -26,8 +26,6 @@ #include "util_path.h" #include "util_types.h" -#define BOOST_FILESYSTEM_VERSION 2 - #include <boost/filesystem.hpp> #include <boost/algorithm/string.hpp> @@ -117,7 +115,7 @@ void Cache::clear_except(const string& name, const set<string>& except) boost::filesystem::directory_iterator it(dir), it_end; for(; it != it_end; it++) { - string filename = it->path().filename(); + string filename = it->path().filename().string(); if(boost::starts_with(filename, name)) if(except.find(filename) == except.end()) |