archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Make Cycles compatible with older boost versions.

Browse Source 
Patch by IRIE Shinsuke, thanks!
This commit is contained in:
Sergey Sharybin
2012-07-25 20:25:47 +00:00
parent 06a9482986
commit 8ad3e73965
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/util/util_cache.cpp
View File

@@ -26,6 +26,10 @@
#include "util_path.h" #include "util_path.h"
#include "util_types.h" #include "util_types.h"
#if (BOOST_VERSION < 104400)
# define BOOST_FILESYSTEM_VERSION 2
#endif
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@@ -115,7 +119,11 @@ void Cache::clear_except(const string& name, const set<string>& except)
boost::filesystem::directory_iterator it(dir), it_end; boost::filesystem::directory_iterator it(dir), it_end;
for(; it != it_end; it++) { for(; it != it_end; it++) {
#if (BOOST_FILESYSTEM_VERSION == 2)
string filename = it->path().filename();
#else
string filename = it->path().filename().string(); string filename = it->path().filename().string();
#endif
if(boost::starts_with(filename, name)) if(boost::starts_with(filename, name))
if(except.find(filename) == except.end()) if(except.find(filename) == except.end())

8
intern/cycles/util/util_path.cpp
View File

@@ -26,6 +26,10 @@ OIIO_NAMESPACE_USING
#include <stdio.h> #include <stdio.h>
#if (BOOST_VERSION < 104400)
# define BOOST_FILESYSTEM_VERSION 2
#endif
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@@ -58,7 +62,11 @@ string path_user_get(const string& sub)
string path_filename(const string& path) string path_filename(const string& path)
{ {
#if (BOOST_FILESYSTEM_VERSION == 2)
return boost::filesystem::path(path).filename();
#else
return boost::filesystem::path(path).filename().string(); return boost::filesystem::path(path).filename().string();
#endif
} }
string path_dirname(const string& path) string path_dirname(const string& path)