kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Remove support for Boost filesystem 2.

Browse Source 
This is deprecated since Boost 1.48.
This commit is contained in:
Thomas Dinges 2015-02-18 13:48:16 +01:00
parent 55fd389a70
commit bf0a001e61
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,12 +24,6 @@
#include "util_path.h"
#include "util_types.h"
#include <boost/version.hpp>
#if (BOOST_VERSION < 104400)
# define BOOST_FILESYSTEM_VERSION 2
#endif
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>

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

@ -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())