Make Cycles compatible with older boost versions.
Patch by IRIE Shinsuke, thanks!
This commit is contained in:
@@ -26,6 +26,10 @@
|
||||
#include "util_path.h"
|
||||
#include "util_types.h"
|
||||
|
||||
#if (BOOST_VERSION < 104400)
|
||||
# define BOOST_FILESYSTEM_VERSION 2
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem.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;
|
||||
|
||||
for(; it != it_end; it++) {
|
||||
#if (BOOST_FILESYSTEM_VERSION == 2)
|
||||
string filename = it->path().filename();
|
||||
#else
|
||||
string filename = it->path().filename().string();
|
||||
#endif
|
||||
|
||||
if(boost::starts_with(filename, name))
|
||||
if(except.find(filename) == except.end())
|
||||
|
||||
@@ -26,6 +26,10 @@ OIIO_NAMESPACE_USING
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#if (BOOST_VERSION < 104400)
|
||||
# define BOOST_FILESYSTEM_VERSION 2
|
||||
#endif
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
@@ -58,7 +62,11 @@ string path_user_get(const string& sub)
|
||||
|
||||
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();
|
||||
#endif
|
||||
}
|
||||
|
||||
string path_dirname(const string& path)
|
||||
|
||||
Reference in New Issue
Block a user