Commit: bf0a001e615c85cb998b68888f75e0e51188e650
Author: Thomas Dinges
Date: Wed Feb 18 13:48:16 2015 +0100
Branches: master
https://developer.blender.org/rBbf0a001e615c85cb998b68888f75e0e51188e650
Cleanup: Remove support for Boost filesystem 2.
This is deprecated since Boost 1.48.
===================================================================
M intern/cycles/util/util_cache.cpp
M intern/cycles/util/util_path.cpp
===================================================================
diff --git a/intern/cycles/util/util_cache.cpp
b/intern/cycles/util/util_cache.cpp
index fbc760f..5eebfb1 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 <boost/version.hpp>
-
-#if (BOOST_VERSION < 104400)
-# define BOOST_FILESYSTEM_VERSION 2
-#endif
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index a3dbad0..e8f1ec8 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -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())
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
