diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-20 19:18:39 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-20 19:18:39 -0200 |
commit | cd308f9d2c6a48520b4903d3394eb88c6fd9c8d5 (patch) | |
tree | 366b73bb65dd0705ed5f0bee7157ea6a267e9a8a /artistic/blender-spacenav-libre/boost-1.50.patch | |
parent | abdaf4e8e1fa45d4617a581c1e831e8d0bf01bcd (diff) | |
parent | c375e36ec4c4e0b3c276e2b71bdd0651fa1a6a1d (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'artistic/blender-spacenav-libre/boost-1.50.patch')
-rwxr-xr-x | artistic/blender-spacenav-libre/boost-1.50.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/artistic/blender-spacenav-libre/boost-1.50.patch b/artistic/blender-spacenav-libre/boost-1.50.patch deleted file mode 100755 index fa698a3a6..000000000 --- a/artistic/blender-spacenav-libre/boost-1.50.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp ---- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300 -+++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300 -@@ -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 @@ - 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()) -diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp ---- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300 -+++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300 -@@ -26,8 +26,6 @@ - - #include <stdio.h> - --#define BOOST_FILESYSTEM_VERSION 2 -- - #include <boost/filesystem.hpp> - #include <boost/algorithm/string.hpp> - -@@ -60,7 +58,7 @@ - - string path_filename(const string& path) - { -- return boost::filesystem::path(path).filename(); -+ return boost::filesystem::path(path).filename().string(); - } - - string path_dirname(const string& path) |